diff options
| -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 830505124e..b5d39e1781 100755 --- a/tools/buildbot-build.sh +++ b/tools/buildbot-build.sh @@ -68,15 +68,15 @@ if [[ $mode == "host" ]]; then make_command+=" dx-tests" mode_suffix="-host" elif [[ $mode == "target" ]]; then - if [[ -z "$TARGET_PRODUCT" ]]; then - echo 'TARGET_PRODUCT environment variable is empty; did you forget to run `lunch`?' + if [[ -z "${ANDROID_PRODUCT_OUT}" ]]; then + echo 'ANDROID_PRODUCT_OUT environment variable is empty; did you forget to run `lunch`?' exit 1 fi make_command="make $j_arg $extra_args $showcommands build-art-target-tests $common_targets" make_command+=" libjavacrypto-target libnetd_client-target linker toybox toolbox sh" make_command+=" debuggerd su" make_command+=" ${out_dir}/host/linux-x86/bin/adb libstdc++ " - make_command+=" ${out_dir}/target/product/${TARGET_PRODUCT}/system/etc/public.libraries.txt" + make_command+=" ${ANDROID_PRODUCT_OUT#"${ANDROID_BUILD_TOP}/"}/system/etc/public.libraries.txt" if [[ -n "$ART_TEST_CHROOT" ]]; then # These targets are needed for the chroot environment. make_command+=" crash_dump event-log-tags" |