diff options
| author | davidevinavil <davidevinavil@gmail.com> | 2018-08-18 14:23:31 +0200 |
|---|---|---|
| committer | Davide Garberi <dade.garberi@gmail.com> | 2018-08-31 23:17:47 +0200 |
| commit | 04a7bd03b9aa144ba8efb505c3efc2a10b944ced (patch) | |
| tree | 3fe9c579107032e83bf24eb673b56c5bb55fd129 | |
| parent | d10a3da526e2f723276572b5c4007b73b4f67624 (diff) | |
Revert "msm8996-common: Use BOARD_VNDK_VERSION := current"
This reverts commit e35c10e57b9df6454437d2d3b914771da79e5a46.
Change-Id: Iec0cf241399ac609a131f3b298ad5ca1722ce715
Signed-off-by: Davide Garberi <dade.garberi@gmail.com>
| -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, 70 insertions, 4 deletions
diff --git a/BoardConfigCommon.mk b/BoardConfigCommon.mk index 7088360..d67e4a3 100644 --- a/BoardConfigCommon.mk +++ b/BoardConfigCommon.mk @@ -58,8 +58,6 @@ 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 # ANT+ @@ -183,7 +183,6 @@ PRODUCT_PACKAGES += \ liboverlay \ libtinyxml \ libqdMetaData.system \ - libvulkan PRODUCT_COPY_FILES += \ $(LOCAL_PATH)/configs/calib.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/calib.cfg @@ -366,7 +365,7 @@ PRODUCT_PACKAGES += \ # VNDK PRODUCT_PACKAGES += \ - vndk_package + vndk-sp # Vibrator PRODUCT_PACKAGES += \ 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..2e1c2bb --- /dev/null +++ b/vndk/vndk-sp-libs.mk @@ -0,0 +1,27 @@ +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 \ |