From ebe4e2404be80b6acc81845e5eb94aba37a1f87a Mon Sep 17 00:00:00 2001 From: Justin Yun Date: Wed, 23 Jan 2019 19:22:29 +0900 Subject: [PATCH] vndk: do not use prebuilt ld.config..txt Regardless of VNDK version, use template ld.config.txt instead of using prebuilt ld.config.txt. Bug: 74658756 Bug: 123209911 Test: PRODUCT_EXTRA_VNDK_VERSIONS=27 m -j vndk_snapshot_package Change-Id: I0eb527b71e56c555079c524542508a093bf53111 --- rootdir/Android.mk | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 85c7e9e49..d943ace05 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -253,14 +253,11 @@ lib_list_from_prebuilts := true include $(LOCAL_PATH)/update_and_install_ld_config.mk endef -# For VNDK snapshot versions prior to 28, ld.config.txt is installed from the -# prebuilt under /prebuilts/vndk vndk_snapshots := $(wildcard prebuilts/vndk/*) supported_vndk_snapshot_versions := \ - $(strip $(foreach ver,$(patsubst prebuilts/vndk/v%,%,$(vndk_snapshots)),\ - $(if $(call math_gt_or_eq,$(ver),28),$(ver),))) -$(eval $(foreach ver,$(supported_vndk_snapshot_versions),\ - $(call build_versioned_ld_config,$(ver)))) + $(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 :=