diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-08-29 15:08:41 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-08-29 15:08:41 -0700 |
| commit | 8ff94c73dc44355f1063f56f38f4740ca34a73a5 (patch) | |
| tree | 32b3a0ce325c1e707dff4ac5938389d97dcf41c6 /JavaLibrary.mk | |
| parent | 74a180dcb87dfa127680bad59bbaf82710acd430 (diff) | |
| parent | 932cf36899f0f6657f1b0a2c371cd74ed62991c0 (diff) | |
| download | libcore-8ff94c73dc44355f1063f56f38f4740ca34a73a5.zip libcore-8ff94c73dc44355f1063f56f38f4740ca34a73a5.tar.gz libcore-8ff94c73dc44355f1063f56f38f4740ca34a73a5.tar.bz2 | |
resolved conflicts for merge of 932cf368 to klp-dev-plus-aosp
Change-Id: I34643fc9fe299c582b29c8ffce19cc177d475abc
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 21 |
1 files changed, 18 insertions, 3 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 01f0bf4..70c03fd 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. -common_core_src_files := $(call all-main-java-files-under,dalvik dex dom json luni support xml) +common_core_src_files := $(call all-main-java-files-under,dalvik dex dom json luni xml) core_resource_dirs := $(call all-core-resource-dirs,main) test_resource_dirs := $(call all-core-resource-dirs,test) @@ -126,11 +126,11 @@ include $(BUILD_JAVA_LIBRARY) ifeq ($(LIBCORE_SKIP_TESTS),) # Make the core-tests library. include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,crypto dalvik dom harmony-tests json luni support xml) +LOCAL_SRC_FILES := $(call all-test-java-files-under,crypto dalvik dom harmony-tests json luni xml) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := bouncycastle core conscrypt-nojarjar core-junit okhttp -LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc mockwebserver nist-pkix-tests okhttp-tests +LOCAL_STATIC_JAVA_LIBRARIES := core-tests-support sqlite-jdbc mockwebserver nist-pkix-tests okhttp-tests LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_JARJAR_RULES := $(LOCAL_PATH)/crypto/jarjar-rules.txt LOCAL_MODULE := core-tests @@ -139,6 +139,21 @@ include $(BUILD_STATIC_JAVA_LIBRARY) endif ifeq ($(LIBCORE_SKIP_TESTS),) +# Make the core-tests-support 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 +LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit +LOCAL_STATIC_JAVA_LIBRARIES := mockwebserver +LOCAL_JAVACFLAGS := $(local_javac_flags) +LOCAL_JARJAR_RULES := $(LOCAL_PATH)/crypto/jarjar-rules.txt +LOCAL_MODULE := core-tests-support +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk +include $(BUILD_STATIC_JAVA_LIBRARY) +endif + +ifeq ($(LIBCORE_SKIP_TESTS),) # Make the jsr166-tests library. include $(CLEAR_VARS) LOCAL_SRC_FILES := $(call all-test-java-files-under, jsr166-tests) |