Adjust call to build-aml-prebuilts.sh.
It no longer sets variables specific for module building.
Cherry-picked from https://r.android.com/1729792.
Test: See https://r.android.com/1729335
Bug: 190194345
Bug: 174315599
Change-Id: I81fdf11da2dc22a4313cb4e068b63090ac98a2a7
Merged-In: I81fdf11da2dc22a4313cb4e068b63090ac98a2a7
diff --git a/build/build-art-module.sh b/build/build-art-module.sh
index 1b9514e..bc6f266 100755
--- a/build/build-art-module.sh
+++ b/build/build-art-module.sh
@@ -115,11 +115,13 @@
# dependencies, but there are no actual apps to build here.
export TARGET_BUILD_APPS=none
- # Make build-aml-prebuilts.sh set the source_build Soong config variable true.
- export ENABLE_ART_SOURCE_BUILD=true
+ # We use force building LLVM components flag (even though we actually don't
+ # compile them) because we don't have bionic host prebuilts
+ # for them.
+ export FORCE_BUILD_LLVM_COMPONENTS=true
- echo_and_run build/soong/scripts/build-aml-prebuilts.sh "${build_args[@]}" \
- ${MODULE_SDKS_AND_EXPORTS[*]}
+ echo_and_run build/soong/scripts/build-aml-prebuilts.sh \
+ TARGET_PRODUCT=mainline_sdk "${build_args[@]}" ${MODULE_SDKS_AND_EXPORTS[*]}
rm -rf ${DIST_DIR}/mainline-sdks
mkdir -p ${DIST_DIR}