diff options
| author | Rashed Abdel-Tawab <rashed@linux.com> | 2018-04-15 00:23:29 -0700 |
|---|---|---|
| committer | Cosme Domínguez Díaz <cosme.ddiaz@gmail.com> | 2018-07-12 00:33:14 +0200 |
| commit | 3049bb073b54756c4831185aa72054809729d285 (patch) | |
| tree | 28c27aa51cc664a1308d36956766b85549c5d210 | |
| parent | 921fb8ad385b35ee39735b24dfb52d3e200c95cd (diff) | |
msm8996-common: Use BOARD_VNDK_VERSION := current
However, set BOARD_VNDK_RUNTIME_DISABLE := true as well
since camera HAL is a hot mess if attempting to enforce
runtime linker namsespace isolation
Change-Id: I8f2237a0760d9d5feb0a51c9aed0c18119a5863f
| -rw-r--r-- | BoardConfigCommon.mk | 2 | ||||
| -rwxr-xr-x | msm8996.mk | 3 | ||||
| -rw-r--r-- | vndk/Android.mk | 42 | ||||
| -rw-r--r-- | vndk/vndk-sp-libs.mk | 27 |
4 files changed, 4 insertions, 70 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index b23f501..f3d5656 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -58,6 +58,8 @@ TARGET_BOARD_PLATFORM_GPU := qcom-adreno530 # Properties BOARD_PROPERTY_OVERRIDES_SPLIT_ENABLED := true +BOARD_VNDK_RUNTIME_DISABLE := true +BOARD_VNDK_VERSION := current PRODUCT_FULL_TREBLE_OVERRIDE := true TARGET_VENDOR_PROP += $(VENDOR_PATH)/vendor.prop @@ -175,6 +175,7 @@ PRODUCT_PACKAGES += \ liboverlay \ libtinyxml \ libqdMetaData.system \ + libvulkan PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/calib.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/calib.cfg @@ -361,7 +362,7 @@ PRODUCT_PACKAGES += \ # VNDK PRODUCT_PACKAGES += \ - vndk-sp + vndk_package # Vibrator PRODUCT_PACKAGES += \ diff --git a/vndk/Android.mk b/vndk/Android.mk deleted file mode 100644 index 1386fa5..0000000 --- a/vndk/Android.mk +++ /dev/null @@ -1,42 +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_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 deleted file mode 100644 index 2e1c2bb..0000000 --- a/vndk/vndk-sp-libs.mk +++ /dev/null @@ -1,27 +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.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 \ |