commit cf66271aa7abfcccf00b1b43166ad92c4e0e3555
author Narayan Kamath <narayan@google.com> Tue Jan 05 14:33:58 2016 +0000
committer Narayan Kamath <narayan@google.com> Tue Jan 05 14:33:58 2016 +0000
tree 491a2e97f02bbf2bd7356728da8a2c1cbb4a2b8c
parent ce420ca02e1eff5386fecd4ce63c3bf37b270944

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

build/Android.common_path.mk

diff --git a/build/Android.common_path.mk b/build/Android.common_path.mk
index 81cd6ef..ecc9e76 100644
--- a/build/Android.common_path.mk
+++ b/build/Android.common_path.mk
@@ -80,7 +80,7 @@
 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)