Various minor cleanups in the linux bionic scripts.
Test: env DIST_DIR=out/dist art/tools/dist_linux_bionic.sh -j80 \
com.android.art.host com.android.support.apexer
Test: art/tools/build_linux_bionic_tests.sh -j80
Bug: 229123823
Change-Id: I2ba87b1ef0aff38c60e351f237b59496d5b3c554
diff --git a/tools/build_linux_bionic.sh b/tools/build_linux_bionic.sh
index 8992512..c3345cc 100755
--- a/tools/build_linux_bionic.sh
+++ b/tools/build_linux_bionic.sh
@@ -20,11 +20,7 @@
# TODO This runs a 'm clean' prior to building the targets in order to ensure
# that obsolete kati files don't mess up the build.
-if [[ -z $ANDROID_BUILD_TOP ]]; then
- pushd .
-else
- pushd $ANDROID_BUILD_TOP
-fi
+set -e
if [ ! -d art ]; then
echo "Script needs to be run at the root of the android tree"
@@ -41,43 +37,36 @@
soong_args="$soong_args TARGET_BUILD_UNBUNDLED=true"
fi
-source build/envsetup.sh >&/dev/null # for get_build_var
-# Soong needs a bunch of variables set and will not run if they are missing.
-# The default values of these variables is only contained in make, so use
-# nothing to create the variables then remove all the other artifacts.
-# Lunch since it seems we cannot find the build-number otherwise.
-lunch aosp_x86-eng
-build/soong/soong_ui.bash --make-mode $soong_args nothing
-
-if [ $? != 0 ]; then
- exit 1
-fi
-
-out_dir=$(get_build_var OUT_DIR)
-host_out=$(get_build_var HOST_OUT)
+vars="$(build/soong/soong_ui.bash --dumpvars-mode --vars="OUT_DIR")"
+# Assign to a variable and eval that, since bash ignores any error status from
+# the command substitution if it's directly on the eval line.
+eval $vars
# TODO(b/31559095) Figure out a better way to do this.
#
# There is no good way to force soong to generate host-bionic builds currently
# so this is a hacky workaround.
-tmp_soong_var=$(mktemp --tmpdir soong.variables.bak.XXXXXX)
-tmp_build_number=$(cat ${out_dir}/soong/build_number.txt)
-cat $out_dir/soong/soong.variables > ${tmp_soong_var}
+tmp_soong_var=$(mktemp --tmpdir soong.variables.bak.XXXXXX)
+
+TARGET_PRODUCT=aosp_x86 build/soong/soong_ui.bash --make-mode $soong_args ${OUT_DIR}/soong/build_number.txt
+tmp_build_number=$(cat ${OUT_DIR}/soong/build_number.txt)
+
+cat $OUT_DIR/soong/soong.variables > ${tmp_soong_var}
# See comment above about b/123645297 for why we cannot just do m clean. Clear
# out all files except for intermediates and installed files and dexpreopt.config.
-find $out_dir/ -maxdepth 1 -mindepth 1 \
+find $OUT_DIR/ -maxdepth 1 -mindepth 1 \
-not -name soong \
-not -name host \
-not -name target | xargs -I '{}' rm -rf '{}'
-find $out_dir/soong/ -maxdepth 1 -mindepth 1 \
+find $OUT_DIR/soong/ -maxdepth 1 -mindepth 1 \
-not -name .intermediates \
-not -name host \
-not -name dexpreopt.config \
-not -name target | xargs -I '{}' rm -rf '{}'
-python3 <<END - ${tmp_soong_var} ${out_dir}/soong/soong.variables
+python3 <<END - ${tmp_soong_var} ${OUT_DIR}/soong/soong.variables
import json
import sys
x = json.load(open(sys.argv[1]))
@@ -93,6 +82,6 @@
rm $tmp_soong_var
# Write a new build-number
-echo ${tmp_build_number}_SOONG_ONLY_BUILD > ${out_dir}/soong/build_number.txt
+echo ${tmp_build_number}_SOONG_ONLY_BUILD > ${OUT_DIR}/soong/build_number.txt
-build/soong/soong_ui.bash --make-mode --skip-config --soong-only $soong_args $@
+build/soong/soong_ui.bash --make-mode --skip-config --soong-only $soong_args "$@"