commit 5c3c9df16515ac0c383ea29d1528a0653e7b7d97
author Piotr Jastrzebski <haaawk@google.com> Mon Apr 20 10:56:00 2015 +0100
committer Narayan Kamath <narayan@google.com> Wed Nov 11 11:34:49 2015 +0000
tree e45a73897d772521b63feb3dbcaf70c6b0da8898
parent 865b9d2c38284a486fc8608d3193f5b846822595

Set LOCAL_CORE_LIBRARY=true for core-all and core-oj.

Oversight from earlier changes.

Change-Id: I0bcb0d564d30e4e5a59a8714f4373d1771ee70cd

JavaLibrary.mk

diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index e49fa6e..6c4a27b 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -87,6 +87,7 @@
 LOCAL_MODULE := core-all
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk
 LOCAL_REQUIRED_MODULES := tzdata
+LOCAL_CORE_LIBRARY := true
 include $(BUILD_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -100,6 +101,7 @@
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk
 LOCAL_JAVA_LIBRARIES := core-all
 LOCAL_REQUIRED_MODULES := tzdata
+LOCAL_CORE_LIBRARY := true
 include $(BUILD_JAVA_LIBRARY)
 
 # Definitions to make the core library.
@@ -191,6 +193,7 @@
 LOCAL_MODULE := core-all-hostdex
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk
 LOCAL_REQUIRED_MODULES := tzdata-host
+LOCAL_CORE_LIBRARY := true
 include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
 
 include $(CLEAR_VARS)
@@ -204,6 +207,7 @@
 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk
 LOCAL_JAVA_LIBRARIES := core-all-hostdex
 LOCAL_REQUIRED_MODULES := tzdata-host
+LOCAL_CORE_LIBRARY := true
 include $(BUILD_HOST_DALVIK_JAVA_LIBRARY)
 
 # Definitions to make the core library.