From: Narayan Kamath <narayan@google.com>
Date: Tue, 5 Jan 2016 14:33:58 +0000 (+0000)
Subject: Add apache-xml to the device & host boot classpath.
X-Git-Tag: android-x86-7.1-r1~424^2~351^2
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=cf66271aa7abfcccf00b1b43166ad92c4e0e3555;p=android-x86%2Fart.git

Add apache-xml to the device & host boot classpath.

This is used by parts of OpenJdk's java.util.prefs implementation.

bug: 26326992
Change-Id: Ibc0f3043945ec6eefdc97e9bab998e2082baf95e
---

diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index 81cd6efbe..ecc9e76b1 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -80,7 +80,7 @@ HOST_CORE_IMG_LOCATION := $(HOST_OUT_JAVA_LIBRARIES)/core.art
 TARGET_CORE_IMG_LOCATION := $(ART_TARGET_TEST_OUT)/core.art
 
 # Jar files for core.art.
-TARGET_CORE_JARS := core-oj core-libart conscrypt okhttp bouncycastle
+TARGET_CORE_JARS := core-oj core-libart conscrypt okhttp bouncycastle apache-xml
 HOST_CORE_JARS := $(addsuffix -hostdex,$(TARGET_CORE_JARS))
 
 HOST_CORE_DEX_LOCATIONS   := $(foreach jar,$(HOST_CORE_JARS),  $(HOST_OUT_JAVA_LIBRARIES)/$(jar).jar)