diff options
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 137 |
1 files changed, 3 insertions, 134 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 94b1b4d..8543240 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -50,7 +50,7 @@ $(shell cd $(LOCAL_PATH) && ls -d */src/$(1)/{java,resources} 2> /dev/null) endef # The Java files and their associated resources. -core_src_files := $(call all-main-java-files-under,annotation archive auth awt-kernel concurrent crypto dalvik dom icu json junit logging luni luni-kernel math nio_char openssl prefs regex security security-kernel sql suncompat support text x-net xml) +core_src_files := $(call all-main-java-files-under,awt-kernel dalvik dom icu json junit luni luni-kernel openssl prefs security-kernel support x-net xml) core_resource_dirs := $(call all-core-resource-dirs,main) test_resource_dirs := $(call all-core-resource-dirs,test) @@ -104,46 +104,6 @@ include $(BUILD_JAVA_LIBRARY) # TODO: DalvikRunner will make this nonsense obsolete. include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,annotation) -LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core core-tests-support -LOCAL_DX_FLAGS := --core-library -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE := core-tests-annotation -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,archive) -LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core core-tests-support -LOCAL_DX_FLAGS := --core-library -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE := core-tests-archive -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,concurrent) -LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core core-tests-support -LOCAL_DX_FLAGS := --core-library -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE := core-tests-concurrent -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,crypto) -LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core core-tests-support -LOCAL_DX_FLAGS := --core-library -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE := core-tests-crypto -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under,dom) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true @@ -164,16 +124,6 @@ LOCAL_MODULE := core-tests-json include $(BUILD_JAVA_LIBRARY) include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,logging) -LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core core-tests-support -LOCAL_DX_FLAGS := --core-library -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE := core-tests-logging -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under,luni-kernel) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true @@ -194,50 +144,19 @@ LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := \ core \ core-tests-support \ - core-tests-annotation \ - core-tests-archive \ - core-tests-concurrent \ - core-tests-crypto \ core-tests-dom \ core-tests-json \ - core-tests-logging \ core-tests-luni-kernel \ - core-tests-math \ - core-tests-nio_char \ core-tests-prefs \ - core-tests-regex \ - core-tests-security \ - core-tests-sql \ - core-tests-suncompat \ - core-tests-text \ core-tests-x-net \ - core-tests-xml + core-tests-xml \ + sqlite-jdbc LOCAL_DX_FLAGS := --core-library LOCAL_MODULE_TAGS := tests LOCAL_MODULE := core-tests-luni include $(BUILD_JAVA_LIBRARY) include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,math) -LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core core-tests-support -LOCAL_DX_FLAGS := --core-library -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE := core-tests-math -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,nio_char) -LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core core-tests-support -LOCAL_DX_FLAGS := --core-library -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE := core-tests-nio_char -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under,prefs) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true @@ -248,46 +167,6 @@ LOCAL_MODULE := core-tests-prefs include $(BUILD_JAVA_LIBRARY) include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,regex) -LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core core-tests-support -LOCAL_DX_FLAGS := --core-library -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE := core-tests-regex -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,security) -LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core core-tests-support -LOCAL_DX_FLAGS := --core-library -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE := core-tests-security -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,sql) -LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core core-tests-support sqlite-jdbc -LOCAL_DX_FLAGS := --core-library -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE := core-tests-sql -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,suncompat) -LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core core-tests-support -LOCAL_DX_FLAGS := --core-library -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE := core-tests-suncompat -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under,support) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true @@ -298,16 +177,6 @@ LOCAL_MODULE := core-tests-support include $(BUILD_JAVA_LIBRARY) include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,text) -LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core core-tests-support -LOCAL_DX_FLAGS := --core-library -LOCAL_MODULE_TAGS := tests -LOCAL_MODULE := core-tests-text -include $(BUILD_JAVA_LIBRARY) - -include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under,x-net) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true |