From: Roland Levillain <rpl@google.com>
Date: Mon, 7 Dec 2015 12:04:03 +0000 (+0000)
Subject: Fix the ART Buildbots using the master-art manifest.
X-Git-Tag: android-x86-7.1-r1~872^2~11^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=f1389288c6f642e16b5d9a06ef43f982dfeeb30d;p=android-x86%2Fart.git

Fix the ART Buildbots using the master-art manifest.

When system/core/base/include/android-base is missing, create it as a
symlink to system/core/base/include/base.

This change is very brittle and is only to unblock the ART Buildbots.
It should be a temporary solution while we come up with something
better.

Bug: 26051370
Change-Id: Ie412fbf170e2cd260f77caaeb7af0b2e399ef3ab
---

diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index 02787fba4..37b4c485a 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