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 diff -git a/ojluni/src/main/resources/com/sun/accessibility/internal/resources/accessibility.properties b/ojluni/src/main/resources/com/sun/accessibility/internal/resources/accessibility.properties 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. 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. -49,7 49,9 # The Java files and their associated resources.
LOCAL_JAVA_RESOURCE_FILES won't work properly due to limitations inĬhange-Id: Id0d347858d2a4d717660dad48d0ab198a078fb3c diff -git a/JavaLibrary.mk b/JavaLibrary.mk
LOCAL_JAVA_RESOURCE_DIRS will end up including tons of unnecessary 7f566ac76d4f7cf922b99d1c59825206899f2ccd Ĭreate a separate directory for the resources we're using.