diff options
| -rwxr-xr-x | tools/buildbot-build.sh | 1 | ||||
| -rwxr-xr-x | tools/run-jdwp-tests.sh | 6 |
2 files changed, 6 insertions, 1 deletions
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh index e447ab4cf4..31bddd5213 100755 --- a/tools/buildbot-build.sh +++ b/tools/buildbot-build.sh @@ -80,6 +80,7 @@ elif [[ $mode == "target" ]]; then 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" mode_suffix="-target" diff --git a/tools/run-jdwp-tests.sh b/tools/run-jdwp-tests.sh index 21ddcbc062..56d412bfa0 100755 --- a/tools/run-jdwp-tests.sh +++ b/tools/run-jdwp-tests.sh @@ -216,7 +216,11 @@ else if [[ "$mode" == "host" ]]; then dump_command="/bin/kill -3" else - dump_command="/system/xbin/su root /data/local/tmp/system/bin/debuggerd" + # Note that this dumping command won't work when `$android_root` + # is different from `/system` (e.g. on ART Buildbot devices) when + # the device is running Android N, as the debuggerd protocol + # changed in an incompatible way in Android O (see b/32466479). + dump_command="$android_root/xbin/su root $android_root/bin/debuggerd" fi if [[ $has_gdb = "yes" ]]; then if [[ $mode == "target" ]]; then |