diff options
| author | 2021-10-21 17:36:25 +0100 | |
|---|---|---|
| committer | 2021-10-21 20:55:06 +0100 | |
| commit | 884c147e93aab632ca13d2f0ea28110e8f8752a7 (patch) | |
| tree | 922f83b43624efeec01cd970b89fd0e0d30e1cb8 | |
| parent | 3ff922309ac7d96f572c57152216cd564f775bf3 (diff) | |
Put conscrypt and core-icu4j back into the build targets again.
Partially reverts https://r.android.com/1854516 - these targets are
necessary for Vogar after all (but "m installclean" doesn't clean
enough to verify that).
Test: lunch armv8-eng
rm -rf out/target/common && \
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
Bug: 203776358
Bug: 202521005
Change-Id: I73ce52d86992a8582b16822dbfa75c7e258d2de2
| -rwxr-xr-x | tools/buildbot-build.sh | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh index 231fecdb3c..1242557de1 100755 --- a/tools/buildbot-build.sh +++ b/tools/buildbot-build.sh @@ -119,6 +119,9 @@ if [[ $build_target == "yes" ]]; then # 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" 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 |