diff options
| author | Kenny Root <kroot@google.com> | 2013-08-29 16:12:28 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-08-29 16:12:28 -0700 |
| commit | 429a3e3fef2c3b70da67dc4dbb76ba54cfac2d60 (patch) | |
| tree | 3409310cdc1bda8030b4b2154b903bafc6687e3c /JavaLibrary.mk | |
| parent | 8ff94c73dc44355f1063f56f38f4740ca34a73a5 (diff) | |
| parent | a0a63383693bfc083c7352994db3ed68865e8b9c (diff) | |
| download | libcore-429a3e3fef2c3b70da67dc4dbb76ba54cfac2d60.zip libcore-429a3e3fef2c3b70da67dc4dbb76ba54cfac2d60.tar.gz libcore-429a3e3fef2c3b70da67dc4dbb76ba54cfac2d60.tar.bz2 | |
am a0a63383: Merge "Revert "Revert "Change conscrypt-nojarjar to a static library"""
* commit 'a0a63383693bfc083c7352994db3ed68865e8b9c':
Revert "Revert "Change conscrypt-nojarjar to a static library""
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 70c03fd..2b5b921 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -120,7 +120,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),) @@ -129,8 +129,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 |