diff options
| author | 2015-06-12 11:43:05 +0000 | |
|---|---|---|
| committer | 2015-06-12 11:43:06 +0000 | |
| commit | b684aa939bd17cb43ef6ebdb7b89d175c38c79f0 (patch) | |
| tree | b5b7783be0654c6504d5de3e81448d0d59d19404 | |
| parent | 5dcdf94a7f41cde71b5d15aab66be067ab8bee3f (diff) | |
| parent | 547fa1142c254c6b45c5c3788b9915f76b46b3cd (diff) | |
Merge "Explicitly give the path of the library to build."
| -rwxr-xr-x | tools/buildbot-build.sh | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh index b84ae473f0..62fd67bfd7 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 libjavacoretests" +common_targets="vogar vogar.jar core-tests apache-harmony-jdwp-tests-hostdex out/host/linux-x86/bin/adb jsr166-tests" android_root="/data/local/tmp/system" linker="linker" mode="target" @@ -60,7 +60,7 @@ while true; do done if [[ $mode == "host" ]]; then - make_command="make $j_arg build-art-host-tests $common_targets" + 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 @@ -70,7 +70,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 build-art-target-tests $common_targets libjavacrypto linker toybox toolbox sh" + make_command="make -e $j_arg build-art-target-tests $common_targets libjavacrypto libjavacoretests linker toybox toolbox sh" echo "Executing env $env $make_command" env $env $make_command fi |