diff options
| -rw-r--r-- | CleanSpec.mk | 1 | ||||
| -rw-r--r-- | JavaLibrary.mk | 6 |
2 files changed, 4 insertions, 3 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 1618f1b44..4cde928f1 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -45,6 +45,7 @@ #$(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 797dfee0b..78c9d1346 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 support 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_JAVA_LIBRARIES := bouncycastle core core-junit okhttp +LOCAL_STATIC_JAVA_LIBRARIES := 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 |