diff options
| author | padarshr <padarshr@codeaurora.org> | 2017-07-12 16:46:43 +0530 |
|---|---|---|
| committer | Isaac Chen <isaacchen@isaacchen.cn> | 2018-07-13 00:02:51 +0800 |
| commit | 62ca3a07ab64e48bd89377e000e6c540d962b1a2 (patch) | |
| tree | 8f380563b9f50bfda4468b481e71e89fb7351d30 | |
| parent | 8e4c18602ded397e51564ea7ad3a596ad54529f3 (diff) | |
wayne: Update vndk-sp build mechanism and library set.
This change is to add some more libraries needed to
be present in the vndk-sp library set. Also, move towards
a better the mechanism to build vndk-sp.
Signed-off-by: Isaac Chen <isaacchen@isaacchen.cn>
| -rw-r--r-- | device.mk | 5 | ||||
| -rw-r--r-- | vndk/Android.mk | 44 | ||||
| -rw-r--r-- | vndk/vndk-sp-libs.mk | 28 |
3 files changed, 77 insertions, 0 deletions
@@ -286,3 +286,8 @@ PRODUCT_PROPERTY_OVERRIDES += rild.libpath=/system/vendor/lib64/libril-qc-qmi-1. #Thermal PRODUCT_PACKAGES += android.hardware.thermal@1.0-impl \ android.hardware.thermal@1.0-service + +# VNDK-SP: +PRODUCT_PACKAGES += \ + vndk-sp + diff --git a/vndk/Android.mk b/vndk/Android.mk new file mode 100644 index 0000000..3dd8c85 --- /dev/null +++ b/vndk/Android.mk @@ -0,0 +1,44 @@ +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 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 \ |