commit 62ce6561cb2d6b4df07c851f4bcbf8ac19ef2e4b
author Piotr Jastrzebski <haaawk@google.com> Tue Feb 17 16:49:14 2015 +0000
committer Narayan Kamath <narayan@google.com> Fri Nov 06 15:20:40 2015 +0000
tree a484be46fa6506d835d2aad3fc1e1e526c7f3369
parent afc4ef58d1c153a7f08ef5522f0d108b370c5515

Add core-oj to the list of boot libraries.

With some of java classes packed in core-oj instead of core-libart
we need to use core-oj in runtime.

Change-Id: Ic6d5e48517b284fc626c157234b2d50b49a07196

Android.mk

diff --git a/Android.mk b/Android.mk
index 15e8308..eb29abb 100644
--- a/Android.mk
+++ b/Android.mk
@@ -115,10 +115,12 @@
 ART_HOST_DEPENDENCIES := \
 	$(ART_HOST_EXECUTABLES) \
 	$(HOST_OUT_JAVA_LIBRARIES)/core-libart-hostdex.jar \
+	$(HOST_OUT_JAVA_LIBRARIES)/core-oj-hostdex.jar \
 	$(ART_HOST_OUT_SHARED_LIBRARIES)/libjavacore$(ART_HOST_SHLIB_EXTENSION)
 ART_TARGET_DEPENDENCIES := \
 	$(ART_TARGET_EXECUTABLES) \
 	$(TARGET_OUT_JAVA_LIBRARIES)/core-libart.jar \
+	$(TARGET_OUT_JAVA_LIBRARIES)/core-oj.jar \
 	$(TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so
 ifdef TARGET_2ND_ARCH
 ART_TARGET_DEPENDENCIES += $(2ND_TARGET_OUT_SHARED_LIBRARIES)/libjavacore.so