diff options
| author | Jesse Wilson <jessewilson@google.com> | 2010-05-13 15:50:15 -0700 |
|---|---|---|
| committer | Jesse Wilson <jessewilson@google.com> | 2010-05-17 11:51:32 -0700 |
| commit | 1708c119626a936797c7c9257af52cd629a28cbb (patch) | |
| tree | a4ffb63145deb7a26f8daf42e0f26773f3fcf1b2 /JavaLibrary.mk | |
| parent | f33eae7e84eb6d3b0f4e86b59605bb3de73009f3 (diff) | |
| download | libcore-1708c119626a936797c7c9257af52cd629a28cbb.zip libcore-1708c119626a936797c7c9257af52cd629a28cbb.tar.gz libcore-1708c119626a936797c7c9257af52cd629a28cbb.tar.bz2 | |
Moving junit out of core.jar and into core-junit.jar.
Adapted from master:
https://android-git.corp.google.com/g/50612
Change-Id: I24cde108f1dd70532ff217545445cdc0b2650a48
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 30 |
1 files changed, 25 insertions, 5 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index d3d4355..f0dcd02 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,dalvik dom json junit luni openssl support xml) +core_src_files := $(call all-main-java-files-under,dalvik dom json luni openssl support xml) core_resource_dirs := $(call all-core-resource-dirs,main) test_resource_dirs := $(call all-core-resource-dirs,test) @@ -84,6 +84,24 @@ include $(BUILD_JAVA_LIBRARY) core-intermediates := ${intermediates} +# Make core-junit +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(call all-main-java-files-under,junit) +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES := core +LOCAL_MODULE := core-junit +include $(BUILD_JAVA_LIBRARY) + +# Make core-junitrunner +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(call all-test-java-files-under,junit) +LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES := core core-junit +LOCAL_DX_FLAGS := --core-library +LOCAL_MODULE_TAGS := tests +LOCAL_MODULE := core-junitrunner +include $(BUILD_JAVA_LIBRARY) # Definitions to make the sqlite JDBC driver. @@ -107,7 +125,7 @@ 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 -LOCAL_JAVA_LIBRARIES := core core-tests-support +LOCAL_JAVA_LIBRARIES := core core-junit core-junitrunner core-tests-support LOCAL_DX_FLAGS := --core-library LOCAL_MODULE_TAGS := tests LOCAL_MODULE := core-tests-dom @@ -117,7 +135,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under,json) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core core-tests-support +LOCAL_JAVA_LIBRARIES := core core-junit core-junitrunner core-tests-support LOCAL_DX_FLAGS := --core-library LOCAL_MODULE_TAGS := tests LOCAL_MODULE := core-tests-json @@ -133,6 +151,8 @@ LOCAL_NO_STANDARD_LIBRARIES := true # TODO: we should have a bogus module that just contains tests.AllTests for speed. LOCAL_JAVA_LIBRARIES := \ core \ + core-junit \ + core-junitrunner \ core-tests-support \ core-tests-dom \ core-tests-json \ @@ -147,7 +167,7 @@ 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 -LOCAL_JAVA_LIBRARIES := core +LOCAL_JAVA_LIBRARIES := core core-junit core-junitrunner LOCAL_DX_FLAGS := --core-library LOCAL_MODULE_TAGS := tests LOCAL_MODULE := core-tests-support @@ -157,7 +177,7 @@ include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under,xml) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := core core-tests-support +LOCAL_JAVA_LIBRARIES := core core-junit core-junitrunner core-tests-support LOCAL_DX_FLAGS := --core-library LOCAL_MODULE_TAGS := tests LOCAL_MODULE := core-tests-xml |