ACPR/android_system_core
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge "vndk: do not use prebuilt ld.config.<ver>.txt" am: e72308c6b1

Browse source 
am: 2ab4e5a353

Change-Id: I4b6c5e8472a023fff879b7df34e2866462032c0c
This commit is contained in:
Justin Yun 2019-01-23 19:01:50 -08:00 • committed by android-build-merger
commit e1ae4b40c5
1 changed files with 3 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
rootdir/Android.mk
View file

@ -253,14 +253,11 @@ lib_list_from_prebuilts := true
include $(LOCAL_PATH)/update_and_install_ld_config.mk include $(LOCAL_PATH)/update_and_install_ld_config.mk
endef endef
# For VNDK snapshot versions prior to 28, ld.config.txt is installed from the
# prebuilt under /prebuilts/vndk
vndk_snapshots := $(wildcard prebuilts/vndk/*) vndk_snapshots := $(wildcard prebuilts/vndk/*)
supported_vndk_snapshot_versions := \ supported_vndk_snapshot_versions := \
$(strip $(foreach ver,$(patsubst prebuilts/vndk/v%,%,$(vndk_snapshots)),\ $(strip $(patsubst prebuilts/vndk/v%,%,$(vndk_snapshots)))
$(if $(call math_gt_or_eq,$(ver),28),$(ver),))) $(foreach ver,$(supported_vndk_snapshot_versions),\
$(eval $(foreach ver,$(supported_vndk_snapshot_versions),\ $(eval $(call build_versioned_ld_config,$(ver))))
$(call build_versioned_ld_config,$(ver))))
vndk_snapshots := vndk_snapshots :=
supported_vndk_snapshot_versions := supported_vndk_snapshot_versions :=