From 4b29f380b644fd574d57043e1c833bd9faf2354e Mon Sep 17 00:00:00 2001 From: Nicolas Geoffray Date: Wed, 7 Oct 2015 09:28:52 +0100 Subject: [PATCH] The move to jack forces us to explicitly give the jar path. vogar currently does not support the --classpath option with jack. bug:24723887 Change-Id: I0923ff32ffa62d0ea3fbb4b330e50a3e7dbe8e69 --- tools/buildbot-build.sh | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh index de9b35d3e..631e0a0c5 100755 --- a/tools/buildbot-build.sh +++ b/tools/buildbot-build.sh @@ -19,7 +19,9 @@ if [ ! -d art ]; then exit 1 fi -common_targets="vogar vogar.jar core-tests apache-harmony-jdwp-tests-hostdex jsr166-tests" +out_dir=${OUT_DIR-out} +java_libraries_dir=${out_dir}/target/common/obj/JAVA_LIBRARIES +common_targets="vogar vogar.jar ${java_libraries_dir}/core-tests_intermediates/javalib.jar apache-harmony-jdwp-tests-hostdex ${java_libraries_dir}/jsr166-tests_intermediates/javalib.jar" mode="target" j_arg="-j$(nproc)" showcommands= @@ -44,9 +46,9 @@ while true; do done if [[ $mode == "host" ]]; then - make_command="make $j_arg $showcommands 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 $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 - make_command="make $j_arg $showcommands build-art-target-tests $common_targets libjavacrypto libjavacoretests linker toybox toolbox sh out/host/linux-x86/bin/adb" + make_command="make $j_arg $showcommands build-art-target-tests $common_targets libjavacrypto libjavacoretests linker toybox toolbox sh ${out_dir}/host/linux-x86/bin/adb" fi echo "Executing $make_command" -- 2.11.0