Create a separate directory for the resources we're using.
This becomes necessary because :
- LOCAL_JAVA_RESOURCE_DIRS will end up including tons of unnecessary
crap.
- LOCAL_JAVA_RESOURCE_FILES won't work properly due to limitations in
the Jar tool.
Change-Id: Id0d347858d2a4d717660dad48d0ab198a078fb3c
diff --git a/JavaLibrary.mk b/JavaLibrary.mk
index 5f642a3..9d7fd39 100644
--- a/JavaLibrary.mk
+++ b/JavaLibrary.mk
@@ -49,7 +49,9 @@
endef
# The Java files and their associated resources.
-core_resource_dirs := $(call all-core-resource-dirs,main)
+core_resource_dirs := \
+ luni/src/main/java \
+ ojluni/src/main/resources/
test_resource_dirs := $(call all-core-resource-dirs,test)
test_src_files := $(call all-test-java-files-under,dalvik dom harmony-tests json luni xml)
@@ -99,7 +101,6 @@
# Definitions to make the core library.
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(non_openjdk_java_files)
-LOCAL_JAVA_RESOURCE_DIRS := $(core_resource_dirs)
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVACFLAGS := $(local_javac_flags)
LOCAL_DX_FLAGS := --core-library
@@ -206,7 +207,6 @@
# Definitions to make the core library.
include $(CLEAR_VARS)
LOCAL_SRC_FILES := $(non_openjdk_java_files)
-LOCAL_JAVA_RESOURCE_DIRS := $(core_resource_dirs)
LOCAL_NO_STANDARD_LIBRARIES := true
LOCAL_JAVACFLAGS := $(local_javac_flags)
LOCAL_DX_FLAGS := --core-library