Build API stubs instead of implementation jars for i18n and Conscrypt
deps.
With the thin master-art manifest we rely on the prebuilts for those
modules. They contained the implementation jars as part of the SDKs by
mistake, but that is no longer the case so those dependencies will
fail.
Cherry-pick from https://r.android.com/2102196.
Test: m installclean && \
rm -rf out/{target,host}/common/obj && \
art/tools/buildbot-build.sh && \
art/tools/buildbot-teardown-device.sh && \
art/tools/buildbot-cleanup-device.sh && \
art/tools/buildbot-setup-device.sh && \
art/tools/buildbot-sync.sh && \
art/tools/run-libcore-tests.sh --mode=device --variant=X64 && \
art/tools/run-libcore-tests.sh --mode=host -j48 && \
art/tools/run-libjdwp-tests.sh --mode=device --variant=X64 && \
art/tools/run-libjdwp-tests.sh --mode=host && \
art/test/testrunner/testrunner.py --target --64 && \
art/test/testrunner/testrunner.py --host --64
Bug: 233062411
Change-Id: I8484c17e067c6f744b0715b4cdd73d9b9efa8757
Merged-In: I8484c17e067c6f744b0715b4cdd73d9b9efa8757
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index 4af36c5..48fc004 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -121,9 +121,11 @@
# These are built to go into system/lib(64) to be part of the system linker
# namespace.
make_command+=" libbacktrace libnetd_client-target libprocinfo libtombstoned_client libunwindstack"
- # Extract jars from other APEX SDKs for use by vogar. Note these go into
- # out/target/common/obj/JAVA_LIBRARIES which isn't removed by "m installclean".
- make_command+=" conscrypt core-icu4j"
+ # Stubs for other APEX SDKs, for use by vogar. Referenced from DEVICE_JARS in
+ # external/vogar/src/vogar/ModeId.java.
+ # Note these go into out/target/common/obj/JAVA_LIBRARIES which isn't removed
+ # by "m installclean".
+ make_command+=" i18n.module.public.api.stubs conscrypt.module.public.api.stubs"
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