OSDN Git Service

Fix braino in new build targets.
authorNicolas Geoffray <ngeoffray@google.com>
Mon, 21 Sep 2015 10:20:20 +0000 (11:20 +0100)
committerNicolas Geoffray <ngeoffray@google.com>
Mon, 21 Sep 2015 10:21:38 +0000 (11:21 +0100)
adb should be added to target build, not host build.

Change-Id: I91308f20cee66603441c08ba3dd57c107bf6317c

tools/buildbot-build.sh

index 21eec9b..eb64994 100755 (executable)
@@ -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 out/host/linux-x86/bin/adb"
+  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"
   echo "Executing $make_command"
   $make_command
 elif [[ $mode == "target" ]]; then
@@ -79,7 +79,7 @@ elif [[ $mode == "target" ]]; then
   # Use '-e' to force the override of TARGET_GLOBAL_LDFLAGS.
   # Also, we build extra tools that will be used by tests, so that
   # they are compiled with our own linker.
-  make_command="make -e $j_arg $showcommands build-art-target-tests $common_targets libjavacrypto libjavacoretests linker toybox toolbox sh"
+  make_command="make -e $j_arg $showcommands build-art-target-tests $common_targets libjavacrypto libjavacoretests linker toybox toolbox sh out/host/linux-x86/bin/adb"
   echo "Executing env $env $make_command"
   env $env $make_command
 fi