diff options
| author | Jae Shin <jaeshin@google.com> | 2018-08-10 15:49:17 +0900 |
|---|---|---|
| committer | Jae Shin <jaeshin@google.com> | 2018-08-13 02:19:42 +0000 |
| commit | f6c6aaaf1337cbed0810d3f5d92e46c6ce2e52fe (patch) | |
| tree | f096864baf5809137396906d16324820d5d01e76 /rootdir | |
| parent | 61f474f457cb650cbefa8aad9326fb339a4feb16 (diff) | |
| download | system_core-f6c6aaaf1337cbed0810d3f5d92e46c6ce2e52fe.tar.gz system_core-f6c6aaaf1337cbed0810d3f5d92e46c6ce2e52fe.tar.bz2 system_core-f6c6aaaf1337cbed0810d3f5d92e46c6ce2e52fe.zip | |
Parse the list of supported vndk snapshot versions
This allows the target, ld.config.$VER.txt, to be defined for all
$VERs for which a VNDK snapshot exists under /prebuilts/vndk/v$VER.
With this fix,
1) supported_vndk_snaphsot_versions do not need to
be manually updated everytime a new VNDK snapshot is added and,
2) ld.config.$VER.txt will not be ill-defined in a tree that does
not have the required dependency files under /prebuilts/vndk/v$VER.
Test: m -j ld.config.28.txt
Bug: 74658756
Merged-In: Idb056c21412d4cb7c7a7cb3c247b1d82a4a759ff
Change-Id: Idb056c21412d4cb7c7a7cb3c247b1d82a4a759ff
(cherry picked from commit baeaaf94296cf3d6202362eb1ea46c8acdf8955a)
Diffstat (limited to 'rootdir')
| -rw-r--r-- | rootdir/Android.mk | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/rootdir/Android.mk b/rootdir/Android.mk index 0312859e4..2429b490b 100644 --- a/rootdir/Android.mk +++ b/rootdir/Android.mk @@ -250,10 +250,16 @@ endef # For VNDK snapshot versions prior to 28, ld.config.txt is installed from the # prebuilt under /prebuilts/vndk -supported_vndk_snapshot_versions := 28 +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)))) +vndk_snapshots := +supported_vndk_snapshot_versions := + ####################################### # ld.config.vndk_lite.txt # |