From ea65b21890ba1256a84bcfa15493e132f90fae4c Mon Sep 17 00:00:00 2001
From: Vladimir Marko <vmarko@google.com>
Date: Thu, 13 Dec 2018 13:32:13 +0000
Subject: 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
---
 test/etc/run-test-jar | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'test')

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
-- 
cgit v1.2.3-59-g8ed1b