diff options
| author | Justin Yun <justinyun@google.com> | 2018-01-10 23:52:34 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2018-01-10 23:52:34 +0000 |
| commit | d7bfaea62b07d1f6104d2ccad445e2b084b6e946 (patch) | |
| tree | a90a2240650c8e9259a442aeebe2ee0871bcfd2d /rootdir | |
| parent | 781715eab8383ec7aa9e2b7126ddfdad30b2c007 (diff) | |
| parent | 30ac0d7a274ba1fd66a3043d9ef1bf11180efe74 (diff) | |
| download | system_core-d7bfaea62b07d1f6104d2ccad445e2b084b6e946.tar.gz system_core-d7bfaea62b07d1f6104d2ccad445e2b084b6e946.tar.bz2 system_core-d7bfaea62b07d1f6104d2ccad445e2b084b6e946.zip | |
Merge "Do not append VNDK version if VNDK is not used" am: 4d281880e0 am: 9c378b0e37
am: 30ac0d7a27
Change-Id: I4493f92bf877d9a792837df5c062570f972a6901
Diffstat (limited to 'rootdir')
| -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): |