diff options
| author | 2015-09-21 10:13:40 +0000 | |
|---|---|---|
| committer | 2015-09-21 10:13:40 +0000 | |
| commit | 8c91afd12d714bcdf6fc9e49ae1ba03f7f2d07b0 (patch) | |
| tree | 5ee24f75071e4e5cf3ef328c4f86035d04037c6b | |
| parent | 9e30c0e177adabaaf94a66c91130a19a7632fc7c (diff) | |
| parent | 5e0199b7e0a2478d962a1750bc9478e30bca7c19 (diff) | |
Merge "Remove adb from host build in buildbot."
| -rwxr-xr-x | tools/buildbot-build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh index c69b819d25..21eec9be91 100755 --- a/tools/buildbot-build.sh +++ b/tools/buildbot-build.sh @@ -19,7 +19,7 @@ if [ ! -d art ]; then exit 1 fi -common_targets="vogar vogar.jar core-tests apache-harmony-jdwp-tests-hostdex out/host/linux-x86/bin/adb jsr166-tests" +common_targets="vogar vogar.jar core-tests apache-harmony-jdwp-tests-hostdex jsr166-tests" android_root="/data/local/tmp/system" linker="linker" mode="target" @@ -64,7 +64,7 @@ while true; do done if [[ $mode == "host" ]]; then - make_command="make $j_arg build-art-host-tests $common_targets out/host/linux-x86/lib/libjavacoretests.so out/host/linux-x86/lib64/libjavacoretests.so" + make_command="make $j_arg build-art-host-tests $common_targets out/host/linux-x86/lib/libjavacoretests.so out/host/linux-x86/lib64/libjavacoretests.so out/host/linux-x86/bin/adb" echo "Executing $make_command" $make_command elif [[ $mode == "target" ]]; then |