diff options
| author | Isaac Chen <isaacchen@isaacchen.cn> | 2018-09-05 00:53:37 +0800 |
|---|---|---|
| committer | Isaac Chen <isaacchen@isaacchen.cn> | 2018-09-05 00:00:08 +0000 |
| commit | f40c0a7d0f5621bde8c8e9b111df8b876ec5c9f2 (patch) | |
| tree | 4a0e8bf0e494482be9b0f3aee4a6e170b6463c5d | |
| parent | 5776399bf343fab3c44326408b4ca98c17e62027 (diff) | |
Revert "wayne: Update vndk-sp build mechanism and library set."
This reverts commit 62ca3a07ab64e48bd89377e000e6c540d962b1a2.
| -rw-r--r-- | device.mk | 4 | ||||
| -rw-r--r-- | vndk/Android.mk | 44 | ||||
| -rw-r--r-- | vndk/vndk-sp-libs.mk | 28 |
3 files changed, 0 insertions, 76 deletions
@@ -426,10 +426,6 @@ PRODUCT_PACKAGES += \ android.hardware.vibrator@1.0-impl \ android.hardware.vibrator@1.0-service -# VNDK-SP: -PRODUCT_PACKAGES += \ - vndk-sp - # Wifi PRODUCT_PACKAGES += \ android.hardware.wifi@1.0-service \ diff --git a/vndk/Android.mk b/vndk/Android.mk deleted file mode 100644 index 3dd8c85..0000000 --- a/vndk/Android.mk +++ /dev/null @@ -1,44 +0,0 @@ -LOCAL_PATH := $(call my-dir) - -include $(LOCAL_PATH)/vndk-sp-libs.mk - -define define-vndk-sp-lib -include $$(CLEAR_VARS) -LOCAL_MODULE := $1.vndk-sp-gen -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_PREBUILT_MODULE_FILE := $$(TARGET_OUT_INTERMEDIATE_LIBRARIES)/$1.so -LOCAL_STRIP_MODULE := false -LOCAL_MULTILIB := first -LOCAL_MODULE_TAGS := optional -LOCAL_INSTALLED_MODULE_STEM := $1.so -LOCAL_MODULE_SUFFIX := .so -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := vndk-sp -include $$(BUILD_PREBUILT) - -ifneq ($$(TARGET_2ND_ARCH),) -ifneq ($$(TARGET_TRANSLATE_2ND_ARCH),true) -include $$(CLEAR_VARS) -LOCAL_MODULE := $1.vndk-sp-gen -LOCAL_MODULE_CLASS := SHARED_LIBRARIES -LOCAL_PREBUILT_MODULE_FILE := $$($$(TARGET_2ND_ARCH_VAR_PREFIX)TARGET_OUT_INTERMEDIATE_LIBRARIES)/$1.so -LOCAL_STRIP_MODULE := false -LOCAL_MULTILIB := 32 -LOCAL_MODULE_TAGS := optional -LOCAL_INSTALLED_MODULE_STEM := $1.so -LOCAL_MODULE_SUFFIX := .so -LOCAL_VENDOR_MODULE := true -LOCAL_MODULE_RELATIVE_PATH := vndk-sp -include $$(BUILD_PREBUILT) -endif # TARGET_TRANSLATE_2ND_ARCH is not true -endif # TARGET_2ND_ARCH is not empty -endef - -$(foreach lib,$(VNDK_SP_LIBRARIES),\ - $(eval $(call define-vndk-sp-lib,$(lib)))) - -include $(CLEAR_VARS) -LOCAL_MODULE := vndk-sp -LOCAL_MODULE_TAGS := optional -LOCAL_REQUIRED_MODULES := $(addsuffix .vndk-sp-gen,$(VNDK_SP_LIBRARIES)) -include $(BUILD_PHONY_PACKAGE) diff --git a/vndk/vndk-sp-libs.mk b/vndk/vndk-sp-libs.mk deleted file mode 100644 index 19345bb..0000000 --- a/vndk/vndk-sp-libs.mk +++ /dev/null @@ -1,28 +0,0 @@ -VNDK_SP_LIBRARIES := \ - android.hardware.graphics.allocator@2.0 \ - android.hardware.graphics.mapper@2.0 \ - android.hardware.graphics.common@1.0 \ - android.hardware.renderscript@1.0 \ - android.hidl.base@1.0 \ - android.hidl.memory@1.0 \ - libRSCpuRef \ - libRSDriver \ - libRS_internal \ - libbacktrace \ - libbase \ - libbcinfo \ - libblas \ - libc++ \ - libcompiler_rt \ - libcutils \ - libft2 \ - libhardware \ - libhidlbase \ - libhidlmemory \ - libhidltransport \ - libhwbinder \ - libion \ - liblzma \ - libpng \ - libunwind \ - libutils \ |