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

Commit ebe4e240 authored by Justin Yun's avatar Justin Yun
Browse files

vndk: do not use prebuilt ld.config.<ver>.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
parent 1cab2c6b

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 :=