commit 052a00f64e82b524fcb4320897b46dc941670a22
author Piotr Jastrzebski <haaawk@google.com> Tue Feb 17 16:55:52 2015 +0000
committer Narayan Kamath <narayan@google.com> Thu Dec 24 10:10:55 2015 +0000
tree 74921fe816deba6f408f46b3ab656723cbf3245a
parent f9911ae087189c26e0ef8a2334233116a8944aa7

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.

(cherry picked from commit 89b94c827f92e107b286ab60876ff9f75ba22a33)

Change-Id: I025c0adc70535bf23def3ab0ce28a1bfaef72514

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 556d52b..af6a4dc 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -706,7 +706,7 @@
 
 # allow overriding default Java libraries on a per-target basis
 ifeq ($(TARGET_DEFAULT_JAVA_LIBRARIES),)
-  TARGET_DEFAULT_JAVA_LIBRARIES := core-libart core-junit ext framework okhttp
+  TARGET_DEFAULT_JAVA_LIBRARIES := core-oj core-libart core-junit ext framework okhttp
 endif
 
 # Flags for DEX2OAT