diff options
| author | Kenny Root <kroot@google.com> | 2013-08-29 10:09:03 -0700 |
|---|---|---|
| committer | Kenny Root <kroot@google.com> | 2013-08-29 10:09:03 -0700 |
| commit | aae2e51f245328652c00c95004f394ff360e2fb8 (patch) | |
| tree | 9e41463103d19abd0ecc67ba1ba6f5816160e650 | |
| parent | 69314139247afa971dedc262b5a5fd1cf891d132 (diff) | |
| download | libcore-aae2e51f245328652c00c95004f394ff360e2fb8.zip libcore-aae2e51f245328652c00c95004f394ff360e2fb8.tar.gz libcore-aae2e51f245328652c00c95004f394ff360e2fb8.tar.bz2 | |
Revert "Change conscrypt-nojarjar to a static library"
FrameworksCoreTests is too bloated now. Revert this.
This reverts commit 69314139247afa971dedc262b5a5fd1cf891d132.
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | JavaLibrary.mk | 6 |
2 files changed, 3 insertions, 4 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 4cde928..1618f1b 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -45,7 +45,6 @@ #$(call add-clean-step, find $(OUT) -type f -name "IGTalkSession*" -print0 | xargs -0 rm -f) #$(call add-clean-step, rm -rf $(PRODUCT_OUT)/data/*) #$(call add-clean-step, rm -rf $(OUT)/obj/SHARED_LIBRARIES/libdvm*) -$(call add-clean-step, rm -rf $(OUT)/system/framework/conscrypt-nojarjar.jar) # ************************************************ # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST # ************************************************ diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 78c9d13..797dfee 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_STATIC_JAVA_LIBRARY) +include $(BUILD_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 support xml) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit okhttp -LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc mockwebserver nist-pkix-tests conscrypt-nojarjar okhttp-tests +LOCAL_JAVA_LIBRARIES := bouncycastle core conscrypt-nojarjar core-junit okhttp +LOCAL_STATIC_JAVA_LIBRARIES := 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 |