commit a61daf45610bcb8bf8619168190b8f18490471e6
author Narayan Kamath <narayan@google.com> Tue Nov 24 13:31:36 2015 +0000
committer Narayan Kamath <narayan@google.com> Tue Nov 24 16:34:57 2015 +0000
tree 812d6a27db7649f4d6c1bc59556acee627a413a0
parent 3d27623602f23683be9c7ce03f4c4d2f4d3120ed

Include ICU4J resources in core-libart / core-libart-hostex.

Was accidentally omitted in the enso merge.

Change-Id: I9cb5dc65ab796b9b23c1dc9eac701e9ee2c68ff6

JavaLibrary.mk

diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index 78071cb..906916d 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -112,6 +112,7 @@
 # Definitions to make the core library.
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(non_openjdk_java_files) $(android_icu4j_src_files)
+LOCAL_JAVA_RESOURCE_DIRS := $(android_icu4j_resource_dirs)
 LOCAL_NO_STANDARD_LIBRARIES := true
 LOCAL_JAVACFLAGS := $(local_javac_flags)
 LOCAL_DX_FLAGS := --core-library
@@ -207,6 +208,7 @@
 # Definitions to make the core library.
 include $(CLEAR_VARS)
 LOCAL_SRC_FILES := $(non_openjdk_java_files) $(android_icu4j_src_files)
+LOCAL_JAVA_RESOURCE_DIRS := $(android_icu4j_resource_dirs)
 LOCAL_NO_STANDARD_LIBRARIES := true
 LOCAL_JAVACFLAGS := $(local_javac_flags)
 LOCAL_DX_FLAGS := --core-library