aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorVinay Verma <vvinay@codeaurora.org>2017-06-14 14:35:18 +0530
committerDavide Garberi <dade.garberi@gmail.com>2017-12-16 18:57:18 +0100
commitf50f7f7bc27272807808b96f4d29ea8d3dae6774 (patch)
tree12c0b3c28959319dfe33536f6de40da6f276869a
parent340d4fbf0fc4012686fcdca2411d8f61b97f8cb6 (diff)
msm8996-common: Add vndk-sp
Add vndk sp libraries to system lib. Change-Id: Ia5b0087506571a929169736dfe108e7ff3f6d40f Install sp vndk libs in system Change-Id: I4cbbf9d0e6fd615c0f23c8be06cc93e8df2069f1 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. Change-Id: Iac86c8ece08c2dae94fce6e94deb670aa742e3dc Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
-rwxr-xr-xmsm8996.mk4
-rw-r--r--vndk/Android.mk42
-rw-r--r--vndk/vndk-sp-libs.mk28
3 files changed, 74 insertions, 0 deletions
diff --git a/msm8996.mk b/msm8996.mk
index 2b9ba04..6f455bd 100755
--- a/msm8996.mk
+++ b/msm8996.mk
@@ -254,6 +254,10 @@ PRODUCT_COPY_FILES += \
PRODUCT_COPY_FILES += \
$(LOCAL_PATH)/configs/thermal-engine.conf:system/etc/thermal-engine.conf
+# VNDK-SP:
+PRODUCT_PACKAGES += \
+ vndk-sp
+
# Wifi
PRODUCT_PACKAGES += \
libwpa_client \
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 \