diff options
author | Justin Yun <justinyun@google.com> | 2018-01-10 09:38:19 +0900 |
---|---|---|
committer | Justin Yun <justinyun@google.com> | 2018-01-11 08:29:54 +0900 |
commit | dd16301babc01b0d3f49d297097c8a61d8b45863 (patch) | |
tree | 555d8e18deccec0a4a911a85f4b62d7c88daa45c /rootdir/Android.mk | |
parent | ea4c7d572750597c864b13c180ae6f9903a02c02 (diff) | |
download | system_core-dd16301babc01b0d3f49d297097c8a61d8b45863.tar.gz system_core-dd16301babc01b0d3f49d297097c8a61d8b45863.tar.bz2 system_core-dd16301babc01b0d3f49d297097c8a61d8b45863.zip |
Do not append VNDK version if VNDK is not used
If BOARD_VNDK_VERSION is not defined, ro.vndk.version will not be
set. In this case, the device, is not able to use versioned
configuration files.
Check BOARD_VNDK_VERSION to append the VNDK version to the namespace
configuration files.
Bug: 71730104
Test: Check boot on both 2016 and 2017 Pixel devices.
Change-Id: I1df27c75de42a526768a156387f22a934cda6d72
Diffstat (limited to 'rootdir/Android.mk')
-rw-r--r-- | rootdir/Android.mk | 20 |
1 files changed, 9 insertions, 11 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 19269d886..7804f6d39 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -125,14 +125,12 @@ $(LOCAL_BUILT_MODULE): $(LOCAL_PATH)/init.environ.rc.in $(bcp_dep) bcp_md5 := bcp_dep := -# If PLATFORM_VNDK_VERSION is defined and not "current", generate versioned -# module names for ld.config.txt, llndk.libraries.txt and vndksp.libraries.txt -# files. -define versioned_module_name +# If BOARD_VNDK_VERSION is defined, append PLATFORM_VNDK_VERSION to base name. +define append_vndk_version $(strip \ - $(if $(filter-out current,$(PLATFORM_VNDK_VERSION)), \ - $(basename $(LOCAL_MODULE)).$(PLATFORM_VNDK_VERSION)$(suffix $(LOCAL_MODULE)), \ - $(LOCAL_MODULE) \ + $(if $(BOARD_VNDK_VERSION), \ + $(basename $(1)).$(PLATFORM_VNDK_VERSION)$(suffix $(1)), \ + $(1) \ ) \ ) endef @@ -153,7 +151,7 @@ ifeq ($(_enforce_vndk_at_runtime),true) LOCAL_MODULE := ld.config.txt LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) -LOCAL_MODULE_STEM := $(call versioned_module_name) +LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE)) include $(BUILD_SYSTEM)/base_rules.mk llndk_libraries := $(call normalize-path-list,$(addsuffix .so,\ @@ -200,7 +198,7 @@ else # if _enforce_vndk_at_runtime is not true LOCAL_MODULE := ld.config.txt ifeq ($(PRODUCT_TREBLE_LINKER_NAMESPACES)|$(SANITIZE_TARGET),true|) LOCAL_SRC_FILES := etc/ld.config.txt - LOCAL_MODULE_STEM := $(call versioned_module_name) + LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE)) else LOCAL_SRC_FILES := etc/ld.config.legacy.txt LOCAL_MODULE_STEM := $(LOCAL_MODULE) @@ -216,7 +214,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := llndk.libraries.txt LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) -LOCAL_MODULE_STEM := $(call versioned_module_name) +LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE)) include $(BUILD_SYSTEM)/base_rules.mk $(LOCAL_BUILT_MODULE): PRIVATE_LLNDK_LIBRARIES := $(LLNDK_LIBRARIES) $(LOCAL_BUILT_MODULE): @@ -232,7 +230,7 @@ include $(CLEAR_VARS) LOCAL_MODULE := vndksp.libraries.txt LOCAL_MODULE_CLASS := ETC LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) -LOCAL_MODULE_STEM := $(call versioned_module_name) +LOCAL_MODULE_STEM := $(call append_vndk_version,$(LOCAL_MODULE)) include $(BUILD_SYSTEM)/base_rules.mk $(LOCAL_BUILT_MODULE): PRIVATE_VNDK_SAMEPROCESS_LIBRARIES := $(VNDK_SAMEPROCESS_LIBRARIES) $(LOCAL_BUILT_MODULE): |