diff options
| author | Isaac Chen <tingyi364@gmail.com> | 2019-06-29 13:39:35 +0200 |
|---|---|---|
| committer | TingyiChen <tingyi364@gmail.com> | 2019-08-13 11:54:44 +0200 |
| commit | ec36531751026e0cc13f3181491e10147183aed2 (patch) | |
| tree | ff01d0c80979f0355e96e72dd5cd9b2b54532671 | |
| parent | ed93546d982c49955049d3df08fb036eecc75186 (diff) | |
Revert "Revert "wayne: Update vndk-sp build mechanism and library set.""
This reverts commit f40c0a7d0f5621bde8c8e9b111df8b876ec5c9f2.
Change-Id: I2149adfb3787458d6091ca96e198b37f0bab6e08
| -rw-r--r-- | vndk/Android.mk | 42 | ||||
| -rw-r--r-- | vndk/vndk-sp-libs.mk | 28 | ||||
| -rw-r--r-- | wayne.mk | 4 |
3 files changed, 74 insertions, 0 deletions
diff --git a/vndk/Android.mk b/vndk/Android.mk new file mode 100644 index 0000000..1386fa5 --- /dev/null +++ b/vndk/Android.mk @@ -0,0 +1,42 @@ +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_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_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 new file mode 100644 index 0000000..19345bb --- /dev/null +++ b/vndk/vndk-sp-libs.mk @@ -0,0 +1,28 @@ +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 \ @@ -431,6 +431,10 @@ 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 \ |