Remove the core-icu4j implementation library from run tests
compilation.
It's a separate APEX module so ART tests should not bypass its public
API.
Also clean up conscrypt build target from the buildbot-build.sh script
- it should not be a build time dependency. (The runtime dependencies
on both modules are satisfied through their APEX modules.)
This relands https://r.android.com/1828052 with some more work.
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/test/testrunner/testrunner.py --target --64 && \
art/tools/run-libjdwp-tests.sh --mode=device --variant=X64 && \
art/tools/run-libcore-tests.sh --mode=device --variant=X64
Test: art/test/testrunner/testrunner.py --target --64 -t 683
on device chroot - check that it fails without
https://r.android.com/1853031 and works with it.
Test: rm -rf out/target/common && \
art/tools/buildbot-build.sh --host && \
art/test/testrunner/testrunner.py --host && \
art/tools/run-libjdwp-tests.sh --mode=host && \
art/tools/run-libcore-tests.sh --mode=host
(10 tests already failing in libcore - no regression)
Bug: 202711962
Bug: 192006406
Change-Id: Id9bb81fa5ff3893c364f31cc90aa50424fad9adc
diff --git a/build/apex/Android.bp b/build/apex/Android.bp
index 0d877f8..e8cb4b8 100644
--- a/build/apex/Android.bp
+++ b/build/apex/Android.bp
@@ -184,7 +184,6 @@
name: "art-run-test-bootclasspath",
sdk_version: "core_platform",
static_libs: libcore_java_libs + [
- "core-icu4j-host",
"framework-annotations-lib",
],
}
diff --git a/tools/bootjars.sh b/tools/bootjars.sh
index 6c39d31..1a4989a 100755
--- a/tools/bootjars.sh
+++ b/tools/bootjars.sh
@@ -75,7 +75,7 @@
# Note: This must start with the CORE_IMG_JARS in Android.common_path.mk
# because that's what we use for compiling the boot.art image.
# It may contain additional modules from TEST_CORE_JARS.
- core_jars_list="core-oj core-libart okhttp bouncycastle apache-xml core-icu4j"
+ core_jars_list="core-oj core-libart okhttp bouncycastle apache-xml"
boot_jars_list=""
boot_separator=""
for boot_module in ${core_jars_list}; do
diff --git a/tools/buildbot-build.sh b/tools/buildbot-build.sh
index e9ff627..231fecd 100755
--- a/tools/buildbot-build.sh
+++ b/tools/buildbot-build.sh
@@ -119,9 +119,6 @@
# 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"
- # testrunner in chroot requires the class files for conscrypt and ICU (cf.
- # https://r.android.com/1828052).
- 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