diff options
| author | Kiyoung Kim <kiyoungkim@google.com> | 2019-10-07 17:30:42 +0900 |
|---|---|---|
| committer | Kiyoung Kim <kiyoungkim@google.com> | 2019-10-07 17:30:42 +0900 |
| commit | 7f5ec44dbc67fa69066f17b656de5b4edd772d5c (patch) | |
| tree | 0eaf72d295c4a9287b4d97a0cc82b784cca7bd69 | |
| parent | 2e7b3df6860291aaf2ee7fb71d3061e1998b5d46 (diff) | |
Disable to build ld.config.txt with previous vndk version
As generic ld.config.txt will be covered with linker config generator,
ld.config.txt with previous vndk build is no longer required. This
change removes this part so there will be no unnecessary build step for
multiple vndk version build. Also vndk snapshot will have vndkcore and
vndkprivate files with version number, update_and_install_ld_config.mk
has been updated temporary for vndk_lite build.
Bug: 142072719
Test: m -j passed with aosp_arm64 build
Change-Id: Ia7529c80b179dc262c6e7646a34c2a05a0d9be84
| -rw-r--r-- | rootdir/Android.mk | 29 | ||||
| -rw-r--r-- | rootdir/update_and_install_ld_config.mk | 4 |
2 files changed, 2 insertions, 31 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index a70507185..e1bb02fc6 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -260,35 +260,6 @@ include $(BUILD_PREBUILT) endif # ifeq ($(_enforce_vndk_at_runtime),true) -# ld.config.txt for VNDK versions older than PLATFORM_VNDK_VERSION -# are built with the VNDK libraries lists under /prebuilts/vndk. -# -# ld.config.$(VER).txt is built and installed for all VNDK versions -# listed in PRODUCT_EXTRA_VNDK_VERSIONS. -# -# $(1): VNDK version -define build_versioned_ld_config -include $(CLEAR_VARS) -LOCAL_MODULE := ld.config.$(1).txt -LOCAL_MODULE_CLASS := ETC -LOCAL_MODULE_PATH := $(TARGET_OUT_ETC) -LOCAL_MODULE_STEM := $$(LOCAL_MODULE) -include $(BUILD_SYSTEM)/base_rules.mk -ld_config_template := $(LOCAL_PATH)/etc/ld.config.txt -vndk_version := $(1) -lib_list_from_prebuilts := true -include $(LOCAL_PATH)/update_and_install_ld_config.mk -endef - -vndk_snapshots := $(wildcard prebuilts/vndk/*) -supported_vndk_snapshot_versions := \ - $(strip $(patsubst prebuilts/vndk/v%,%,$(vndk_snapshots))) -$(foreach ver,$(supported_vndk_snapshot_versions),\ - $(eval $(call build_versioned_ld_config,$(ver)))) - -vndk_snapshots := -supported_vndk_snapshot_versions := - ####################################### # ld.config.vndk_lite.txt # diff --git a/rootdir/update_and_install_ld_config.mk b/rootdir/update_and_install_ld_config.mk index c4b8e4eec..44f7b656c 100644 --- a/rootdir/update_and_install_ld_config.mk +++ b/rootdir/update_and_install_ld_config.mk @@ -38,8 +38,8 @@ endif llndk_libraries_file := $(library_lists_dir)/llndk.libraries.$(vndk_version).txt vndksp_libraries_file := $(library_lists_dir)/vndksp.libraries.$(vndk_version).txt -vndkcore_libraries_file := $(library_lists_dir)/vndkcore.libraries.txt -vndkprivate_libraries_file := $(library_lists_dir)/vndkprivate.libraries.txt +vndkcore_libraries_file := $(library_lists_dir)/vndkcore.libraries.$(vndk_version).txt +vndkprivate_libraries_file := $(library_lists_dir)/vndkprivate.libraries.$(vndk_version).txt llndk_moved_to_apex_libraries_file := $(library_lists_dir)/llndkinapex.libraries.txt ifeq ($(my_vndk_use_core_variant),true) vndk_using_core_variant_libraries_file := $(library_lists_dir)/vndk_using_core_variant.libraries.$(vndk_version).txt |