Disable Bazel in ART branches
Test: Manually ran buildbot script after patching Bazel launch CL
Change-Id: I7e87371c536548c691f7797e2550b13519497a9a
diff --git a/build/README.md b/build/README.md
index 3e577bb..a94d0fc 100644
--- a/build/README.md
+++ b/build/README.md
@@ -37,7 +37,7 @@
```
banchan com.android.art <arch>
- export SOONG_ALLOW_MISSING_DEPENDENCIES=true
+ export SOONG_ALLOW_MISSING_DEPENDENCIES=true BUILD_BROKEN_DISABLE_BAZEL=true
```
For Google internal builds on the internal master-art branch, specify
@@ -45,7 +45,7 @@
```
banchan com.google.android.art mainline_modules_<arch>
- export SOONG_ALLOW_MISSING_DEPENDENCIES=true
+ export SOONG_ALLOW_MISSING_DEPENDENCIES=true BUILD_BROKEN_DISABLE_BAZEL=true
```
`<arch>` is the device architecture, one of `arm`, `arm64`, `x86`, or
diff --git a/test/README.arm_fvp.md b/test/README.arm_fvp.md
index 47ef715..f097b8f 100644
--- a/test/README.arm_fvp.md
+++ b/test/README.arm_fvp.md
@@ -148,6 +148,7 @@
export ART_TEST_CHROOT=/data/local/art-test-chroot
export OVERRIDE_TARGET_FLATTEN_APEX=true
export SOONG_ALLOW_MISSING_DEPENDENCIES=true
+export BUILD_BROKEN_DISABLE_BAZEL=true
export TARGET_BUILD_UNBUNDLED=true
export ART_TEST_RUN_ON_ARM_FVP=true
diff --git a/test/README.chroot.md b/test/README.chroot.md
index b97e56c..ce4670a 100644
--- a/test/README.chroot.md
+++ b/test/README.chroot.md
@@ -53,6 +53,7 @@
1. Initialize the environment:
```bash
export SOONG_ALLOW_MISSING_DEPENDENCIES=true
+ export BUILD_BROKEN_DISABLE_BAZEL=true
. ./build/envsetup.sh
```
2. Select a lunch target corresponding to the architecture you want to
diff --git a/test/testrunner/run_build_test_target.py b/test/testrunner/run_build_test_target.py
index 551e8da..d271b80 100755
--- a/test/testrunner/run_build_test_target.py
+++ b/test/testrunner/run_build_test_target.py
@@ -66,6 +66,7 @@
n_threads = options.n_threads
custom_env = target.get('env', {})
custom_env['SOONG_ALLOW_MISSING_DEPENDENCIES'] = 'true'
+custom_env['BUILD_BROKEN_DISABLE_BAZEL'] = 'true'
# Switch the build system to unbundled mode in the reduced manifest branch.
if not os.path.isdir(env.ANDROID_BUILD_TOP + '/frameworks/base'):
custom_env['TARGET_BUILD_UNBUNDLED'] = 'true'
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index cad218f..449ea37 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -87,7 +87,7 @@
fi
# Allow to build successfully in master-art.
-extra_args="SOONG_ALLOW_MISSING_DEPENDENCIES=true"
+extra_args="SOONG_ALLOW_MISSING_DEPENDENCIES=true BUILD_BROKEN_DISABLE_BAZEL=true"
# Switch the build system to unbundled mode in the reduced manifest branch.
if [ ! -d frameworks/base ]; then
diff --git a/tools/golem/build-target.sh b/tools/golem/build-target.sh
index d8ec58b..1ebd7c9 100755
--- a/tools/golem/build-target.sh
+++ b/tools/golem/build-target.sh
@@ -269,6 +269,8 @@
execute lunch "$lunch_target"
# Golem uses master-art repository which is missing a lot of other libraries.
setenv SOONG_ALLOW_MISSING_DEPENDENCIES true
+ # master-art cannot build with Bazel.
+ setenv BUILD_BROKEN_DISABLE_BAZEL true
# Let the build system know we're not aiming to do a full platform build.
if [ ! -d frameworks/base ]; then
setenv TARGET_BUILD_UNBUNDLED true