Merge "vndk: do not use prebuilt ld.config.<ver>.txt"
This commit is contained in:
commit
e72308c6b1
|
@ -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 :=
|
||||
|
|
Loading…
Reference in New Issue