commit 62ed63185c4fb9fa5fb74c7bddcf9885fa06ac6d
author Piotr Jastrzebski <haaawk@google.com> Tue Feb 17 16:58:52 2015 +0000
committer Narayan Kamath <narayan@google.com> Tue Dec 22 13:10:55 2015 +0000
tree 96aff6423f1ee864ca348c554dd8fb9e75ced003
parent 76a9e55a8fd751e747511a9c7d02dddca31964c3

Add core-oj to the list of core library jars.

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

(cherry picked from commit cfa292e1dad184648bf673167f3f35b4fb34fc93)

Change-Id: Iba481c3df029902a2bd0f9661d0819f4a191b2aa

Android.mk

diff --git a/Android.mk b/Android.mk
index ce01c20..ed3f929 100644
--- a/Android.mk
+++ b/Android.mk
@@ -423,7 +423,7 @@
 			$(framework_res_source_path)/com/android/internal/R.java
 
 LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core-libart conscrypt okhttp core-junit bouncycastle ext
+LOCAL_JAVA_LIBRARIES := core-oj core-libart conscrypt okhttp core-junit bouncycastle ext
 
 LOCAL_MODULE := framework
 
@@ -710,6 +710,7 @@
 	$(framework_res_source_path)/com/android/internal/R.java
 
 framework_docs_LOCAL_API_CHECK_JAVA_LIBRARIES := \
+	core-oj \
 	core-libart \
 	conscrypt \
 	bouncycastle \
@@ -1093,7 +1094,7 @@
 LOCAL_SRC_FILES := $(ext_src_files)
 
 LOCAL_NO_STANDARD_LIBRARIES := true
-LOCAL_JAVA_LIBRARIES := core-libart
+LOCAL_JAVA_LIBRARIES := core-oj core-libart
 LOCAL_STATIC_JAVA_LIBRARIES := libphonenumber-platform
 LOCAL_MODULE_TAGS := optional
 LOCAL_MODULE := ext