commit aa08e525971176254f074564e00b513e3ceed092
author Nicolas Geoffray <ngeoffray@google.com> Mon Sep 27 08:16:29 2021 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Mon Sep 27 10:56:21 2021 +0000
tree 3da57f72343edecff7ad625979b6f6f2b07fc5e3
parent afe94ef38012142e7aaca6b23bcb4f1ca5200d31

Revert "Do not build libraries that depend on deapexer rules."

This reverts commit 3027c60ed7794c899044c2d855ab3af57a8ca8a2.

Reason for revert: Failures on chroot

Change-Id: I1a51e6fdc4f4128ca8cbd58bd845ee15f63f5513

tools/buildbot-build.sh

diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index bf9a860..8b33bfa 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -110,6 +110,8 @@
   make_command+=" build-art-target-tests"
   make_command+=" libnetd_client-target toybox sh libtombstoned_client"
   make_command+=" debuggerd su"
+  # vogar requires the class files for conscrypt and ICU.
+  make_command+=" conscrypt core-icu4j"
   make_command+=" ${ANDROID_PRODUCT_OUT#"${ANDROID_BUILD_TOP}/"}/system/etc/public.libraries.txt"
   # Targets required to generate a linker configuration for device within the
   # chroot environment. The *.libraries.txt targets are required by