From da30904e432cb98eb3b9dc83cfe11a71ec1259c6 Mon Sep 17 00:00:00 2001 From: Roland Levillain Date: Mon, 7 Dec 2015 12:38:24 +0000 Subject: [PATCH] Revert "Fix the ART Buildbots using the master-art manifest." Reverting as repo syncing later won't work, as this symlink is an untracked file. Bug: 26051370 This reverts commit f1389288c6f642e16b5d9a06ef43f982dfeeb30d. Change-Id: Idd41955710b4d3d5809e4f6bf963ed3a4cead126 --- tools/buildbot-build.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh index 37b4c485a..02787fba4 100755 --- a/tools/buildbot-build.sh +++ b/tools/buildbot-build.sh @@ -45,14 +45,6 @@ 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 -- 2.11.0