From c30afd1a3dd6dcc8989295e5def6b4353c5ee953 Mon Sep 17 00:00:00 2001 From: kubersharma001 Date: Fri, 8 May 2020 18:26:14 +0530 Subject: [PATCH] sanders: Import|Kang vndk-sp from marlin android-10.0.0_r35 * https://android.googlesource.com/device/google/marlin/+log/refs/tags/android-10.0.0_r35/vndk/Android.mk Change-Id: I599fd79275b0d8a0ef6ca778eacb6c9a0b4abfac Signed-off-by: ashwatthama --- vndk/Android.mk | 17 ++++++++++++++--- 1 file changed, 14 insertions(+), 3 deletions(-) diff --git a/vndk/Android.mk b/vndk/Android.mk index 8464956..cd39f0c 100644 --- a/vndk/Android.mk +++ b/vndk/Android.mk @@ -1,16 +1,23 @@ +# TODO(b/69526027): DEPRECATE USE OF THIS. +# USE BOARD_VNDK_VERSION:=current instead. + LOCAL_PATH := $(call my-dir) +# b/69526027: This VNDK-SP install routine must be removed. Instead, we must +# build vendor variants of the VNDK-SP modules. + +ifndef BOARD_VNDK_VERSION # The libs with "vndk: {enabled: true, support_system_process: true}" will be # added VNDK_SP_LIBRARIES automatically. And the core variants of the VNDK-SP # libs will be copied to vndk-sp directory. # However, some of those libs need FWK-ONLY libs, which must be listed here # manually. VNDK_SP_LIBRARIES := \ - libdexfile \ - libdexfile_support + libdexfile_support \ + install_in_hw_dir := \ android.hidl.memory@1.0-impl - + vndk_sp_dir := vndk-sp-$(PLATFORM_VNDK_VERSION) define define-vndk-sp-lib @@ -24,6 +31,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_INSTALLED_MODULE_STEM := $1.so LOCAL_MODULE_SUFFIX := .so LOCAL_MODULE_RELATIVE_PATH := $(vndk_sp_dir)$(if $(filter $1,$(install_in_hw_dir)),/hw) +LOCAL_CHECK_ELF_FILES := false include $$(BUILD_PREBUILT) ifneq ($$(TARGET_2ND_ARCH),) @@ -38,6 +46,7 @@ LOCAL_MODULE_TAGS := optional LOCAL_INSTALLED_MODULE_STEM := $1.so LOCAL_MODULE_SUFFIX := .so LOCAL_MODULE_RELATIVE_PATH := $(vndk_sp_dir)$(if $(filter $1,$(install_in_hw_dir)),/hw) +LOCAL_CHECK_ELF_FILES := false include $$(BUILD_PREBUILT) endif # TARGET_TRANSLATE_2ND_ARCH is not true endif # TARGET_2ND_ARCH is not empty @@ -58,6 +67,8 @@ install_in_hw_dir := include $(CLEAR_VARS) LOCAL_MODULE := vndk-sp +LOCAL_MODULE_OWNER := google LOCAL_MODULE_TAGS := optional LOCAL_REQUIRED_MODULES := $(addsuffix .vndk-sp-gen,$(VNDK_SP_LIBRARIES)) include $(BUILD_PHONY_PACKAGE) +endif \ No newline at end of file