diff options
| author | Kenny Root <kroot@google.com> | 2013-08-29 14:31:12 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-08-29 16:01:33 -0700 |
| commit | 55dcd9775c58b79c7e3ea1e4f8a6ed3cc2001ff3 (patch) | |
| tree | 3d024d1bd8f76261850b274fd5f104521ea35416 /JavaLibrary.mk | |
| parent | b397b19a825d69e9122f1241849db726abae5413 (diff) | |
| download | libcore-55dcd9775c58b79c7e3ea1e4f8a6ed3cc2001ff3.zip libcore-55dcd9775c58b79c7e3ea1e4f8a6ed3cc2001ff3.tar.gz libcore-55dcd9775c58b79c7e3ea1e4f8a6ed3cc2001ff3.tar.bz2 | |
Revert "Revert "Change conscrypt-nojarjar to a static library""
This reverts commit aae2e51f245328652c00c95004f394ff360e2fb8.
Split the support library out of core-tests so the frameworks tests
don't go over the method limit.
Change-Id: Ib177a41b9965f213d325964e9723bfdfba2c5b99
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 14b3c66..008b80a 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -112,7 +112,7 @@ LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_MODULE_TAGS := optional LOCAL_MODULE := conscrypt-nojarjar LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk -include $(BUILD_JAVA_LIBRARY) +include $(BUILD_STATIC_JAVA_LIBRARY) ifeq ($(LIBCORE_SKIP_TESTS),) @@ -121,8 +121,8 @@ include $(CLEAR_VARS) 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 := core-tests-support sqlite-jdbc mockwebserver nist-pkix-tests okhttp-tests +LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit okhttp +LOCAL_STATIC_JAVA_LIBRARIES := core-tests-support sqlite-jdbc mockwebserver nist-pkix-tests conscrypt-nojarjar okhttp-tests LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_JARJAR_RULES := $(LOCAL_PATH)/crypto/jarjar-rules.txt LOCAL_MODULE := core-tests |