commit 89b94c827f92e107b286ab60876ff9f75ba22a33
author Piotr Jastrzebski <haaawk@google.com> Tue Feb 17 16:55:52 2015 +0000
committer Narayan Kamath <narayan@google.com> Fri Nov 20 13:53:22 2015 +0000
tree 0e73adfc87ad34b1cfde6a2388d3a37770369dd8
parent 06aabe5325361a58a2b77f56fe92a55e71be0acb

Use core-oj alongside core-libart wherever required.

With some core classes moved to separate core-oj jar
we need to use the new jar.

Change-Id: Ie069c7a93e63b1df854b3137d984b96520562609

core/droiddoc.mk

diff --git a/core/droiddoc.mk b/core/droiddoc.mk
index 7133bc1..dd687b4 100644
--- a/core/droiddoc.mk
+++ b/core/droiddoc.mk
@@ -73,8 +73,8 @@
     $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, sdk_v$(LOCAL_SDK_VERSION))
   endif
 else
-  LOCAL_JAVA_LIBRARIES := core-libart ext framework $(LOCAL_JAVA_LIBRARIES)
-  $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, core-libart)
+  LOCAL_JAVA_LIBRARIES := core-oj core-libart ext framework $(LOCAL_JAVA_LIBRARIES)
+  $(full_target): PRIVATE_BOOTCLASSPATH := $(call java-lib-files, core-oj):$(call java-lib-files, core-libart)
 endif  # LOCAL_SDK_VERSION
 LOCAL_JAVA_LIBRARIES := $(sort $(LOCAL_JAVA_LIBRARIES))