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/pdk_config.mk

diff --git a/core/pdk_config.mk b/core/pdk_config.mk
index 3397d9c..95eb0cc 100644
--- a/core/pdk_config.mk
+++ b/core/pdk_config.mk
@@ -58,6 +58,7 @@
   target/common/obj/JAVA_LIBRARIES/android_stubs_current_intermediates \
   target/common/obj/JAVA_LIBRARIES/bouncycastle_intermediates \
   target/common/obj/JAVA_LIBRARIES/conscrypt_intermediates \
+  target/common/obj/JAVA_LIBRARIES/core-oj_intermediates \
   target/common/obj/JAVA_LIBRARIES/core-libart_intermediates \
   target/common/obj/JAVA_LIBRARIES/core-junit_intermediates \
   target/common/obj/JAVA_LIBRARIES/ext_intermediates \