diff options
| author | 2018-12-21 09:45:03 -0800 | |
|---|---|---|
| committer | 2018-12-21 09:47:41 -0800 | |
| commit | cefcbc05cc10998cbc5742f3ca72c140ff65d6dc (patch) | |
| tree | e9ab93d13dd59f14aaf0fcd57aabec0144b7a204 | |
| parent | 46a8938026c425d54f2c02631ca584b4d1f2666c (diff) | |
Create dexpreopt.config in build_linux_bionic.sh
soong will panic if a json file called $PRODUCT_OUT/dexpreopt.config
is not present. This file normally contains information from make
soong needs to implement half of the dexpreopt support. Since this
support still requires some make parts it is not needed for
linux_bionic builds.
Test: ./art/tools/build_linux_bionic.sh -j72 com.android.runtime.host
Bug: 120436895
Change-Id: Id63e39eefbf5217de05738691f52c352cb1529ee
| -rwxr-xr-x | tools/build_linux_bionic.sh | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/tools/build_linux_bionic.sh b/tools/build_linux_bionic.sh index 94ccc41331..d3c19120ca 100755 --- a/tools/build_linux_bionic.sh +++ b/tools/build_linux_bionic.sh @@ -42,6 +42,7 @@ fi out_dir=$(get_build_var OUT_DIR) host_out=$(get_build_var HOST_OUT) +mk_product_out=$(get_build_var PRODUCT_OUT) # TODO(b/31559095) Figure out a better way to do this. # @@ -52,6 +53,12 @@ tmp_soong_var=$(mktemp --tmpdir soong.variables.bak.XXXXXX) cat $out_dir/soong/soong.variables > ${tmp_soong_var} build/soong/soong_ui.bash --make-mode clean mkdir -p $out_dir/soong +mkdir -p $mk_product_out + +# TODO(b/31559095) Soong will panic if this file isn't present. It contains +# information from MAKE needed to let soong handle the invocation of dex2oat. +# This would be great to have but for now isn't needed. +echo "{}" > $mk_product_out/dexpreopt.config python3 <<END - ${tmp_soong_var} ${out_dir}/soong/soong.variables import json |