Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2ab4e5a3 authored by Justin Yun's avatar Justin Yun Committed by android-build-merger
Browse files

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

am: e72308c6

Change-Id: I913b42ed9a3ddffb380b1cce0d15ee352824a4c7
parents 9abd069f e72308c6

rootdir/Android.mk

+3 −6
Original line number Diff line number Diff line
@@ -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 :=