diff options
| author | 2018-12-13 13:32:13 +0000 | |
|---|---|---|
| committer | 2018-12-14 15:09:19 +0000 | |
| commit | ea65b21890ba1256a84bcfa15493e132f90fae4c (patch) | |
| tree | d3afd1c49c9b26c39ddffd1b9d7ac9b0d375f3fc /test | |
| parent | 500b4da0e8d5746bfc75baa9db3d57f51a0af6af (diff) | |
Add apache-xml to boot class path for tests.
And partially revert
7a85e70b2bf646d1d7a226fbb4e7fafb66871dd5
and fully revert
d4291d68c5dffd992ed8d46d0785d24a5da80026
to re-enable tests.
Test: m test-art-host-gtest
Test: testrunner.py --host --optimizing
Test: m test-art-target-gtest
Test: testrunner.py --target --optimizing
Test: run-libcore-tests --mode=host --variant=X64
Test: run-jdwp-tests --mode=host --variant=X64
Test: run-libcore-tests --mode=target --variant=X64
Test: run-jdwp-tests --mode=target --variant=X64
Bug: 120526172
Change-Id: I5af4853cae84bfc4807d98668b2da2fd9c5fc22e
Diffstat (limited to 'test')
| -rwxr-xr-x | test/etc/run-test-jar | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/etc/run-test-jar b/test/etc/run-test-jar index 4c31ee5160..4e39d098db 100755 --- a/test/etc/run-test-jar +++ b/test/etc/run-test-jar @@ -551,7 +551,7 @@ fi # Note: This must start with the CORE_IMG_JARS in Android.common_path.mk # because that's what we use for compiling the core.art image. # It may contain additional modules from TEST_CORE_JARS. -bpath_modules="core-oj core-libart core-simple okhttp bouncycastle conscrypt" +bpath_modules="core-oj core-libart core-simple okhttp bouncycastle apache-xml conscrypt" if [ "${HOST}" = "y" ]; then framework="${ANDROID_HOST_OUT}/framework" if [ "${ANDROID_HOST_OUT:0:${#ANDROID_BUILD_TOP}+1}" = "${ANDROID_BUILD_TOP}/" ]; then |