diff options
| author | 2015-12-08 00:06:14 +0000 | |
|---|---|---|
| committer | 2015-12-08 00:06:14 +0000 | |
| commit | 231c3b85aa425f07970e9fd705213f71fe9f5a50 (patch) | |
| tree | aecd34eec5a3d21b385c88f0e6580f54c20c15c8 | |
| parent | b51e90dfc446d7a838212a861905249660531369 (diff) | |
| parent | 42061a6e4f1e6b9e7f1ef94281f45e888b32545a (diff) | |
Merge "Fix the ART Buildbots using the master-art manifest." am: a2964d5ab5 am: 0be457fd49
am: 42061a6e4f
* commit '42061a6e4f1e6b9e7f1ef94281f45e888b32545a':
Fix the ART Buildbots using the master-art manifest.
| -rwxr-xr-x | tools/buildbot-build.sh | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh index 02787fba43..37b4c485ab 100755 --- a/tools/buildbot-build.sh +++ b/tools/buildbot-build.sh @@ -45,6 +45,14 @@ while true; do fi done +# Workaround for b/26051370. +# +# system/core/base/include/base has been renamed to +# system/core/base/include/android-base, but the master-art manifest +# is pinned to an older revision for system/core; create this symlink +# by hand to fix include paths. +test -e system/core/base/include/android-base || ln -s base system/core/base/include/android-base + if [[ $mode == "host" ]]; then make_command="make $j_arg $showcommands build-art-host-tests $common_targets ${out_dir}/host/linux-x86/lib/libjavacoretests.so ${out_dir}/host/linux-x86/lib64/libjavacoretests.so" elif [[ $mode == "target" ]]; then |