From 2a9013ee174c7ee40f4e419dc741c8eb4e628946 Mon Sep 17 00:00:00 2001 From: Martin Stjernholm Date: Mon, 21 Dec 2020 11:51:29 +0000 Subject: [PATCH] Set the Soong config variable to keep building ART from source. Without this Soong may run into inconsistencies due to stale prebuilts. This amends https://r.android.com/1529658. Test: TH build of NDK Bug: 175918603 Bug: 172480615 Change-Id: I14680e4547d7d5f560d31ef61b71af8d159c4c53 --- scripts/build-ndk-prebuilts.sh | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/scripts/build-ndk-prebuilts.sh b/scripts/build-ndk-prebuilts.sh index 1a3321900..c27f098ba 100755 --- a/scripts/build-ndk-prebuilts.sh +++ b/scripts/build-ndk-prebuilts.sh @@ -56,6 +56,12 @@ cat > ${SOONG_OUT}/soong.variables << EOF "Ndk_abis": true, "Exclude_draft_ndk_apis": true, + "VendorVars": { + "art_module": { + "source_build": "true" + } + }, + "MissingUsesLibraries": ${MISSING_USES_LIBRARIES} } EOF