Revert "Remove non-required build targets from buildbot-build.sh"
This reverts commit 0007e7305b8e1cb10b78504c6dfd14e50efb26b1.
Reason for revert: Breaks test-libcore step.
Change-Id: Icb26b3181becb01a1a6850944df43e5a808a8b2c
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index 9339a62..71180a2 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -35,7 +35,7 @@
fi
java_libraries_dir=${out_dir}/target/common/obj/JAVA_LIBRARIES
-common_targets="vogar core-tests apache-harmony-jdwp-tests-hostdex jsr166-tests libartpalette-system"
+common_targets="vogar core-tests apache-harmony-jdwp-tests-hostdex jsr166-tests libartpalette-system mockito-target"
mode="target"
j_arg="-j$(nproc)"
showcommands=
@@ -75,7 +75,7 @@
exit 1
fi
make_command="build/soong/soong_ui.bash --make-mode $j_arg $extra_args $showcommands build-art-target-tests $common_targets"
- make_command+=" libnetd_client-target toybox sh"
+ make_command+=" libnetd_client-target toybox toolbox sh"
make_command+=" debuggerd su gdbserver"
make_command+=" libstdc++ "
make_command+=" ${ANDROID_PRODUCT_OUT#"${ANDROID_BUILD_TOP}/"}/system/etc/public.libraries.txt"
