diff options
| author | Kenny Root <kroot@google.com> | 2013-09-17 09:57:22 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-09-17 09:57:22 -0700 |
| commit | 703745c882c5acf12e102a92aff28fd22c5faab0 (patch) | |
| tree | a32163a14beb6ea6f3cb70648d6cd49247bda97a /JavaLibrary.mk | |
| parent | 6646cfe8342426981dde0051ffb17ca094b0a478 (diff) | |
| parent | d058512d7f68bf4dbbd7775b879bc926c23816d0 (diff) | |
| download | libcore-703745c882c5acf12e102a92aff28fd22c5faab0.tar.gz libcore-703745c882c5acf12e102a92aff28fd22c5faab0.tar.bz2 libcore-703745c882c5acf12e102a92aff28fd22c5faab0.zip | |
am d058512d: Merge "Split Conscrypt makefile out from libcore"
* commit 'd058512d7f68bf4dbbd7775b879bc926c23816d0':
Split Conscrypt makefile out from libcore
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 84 |
1 files changed, 0 insertions, 84 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 2bed9bd3e..c44d99100 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -98,31 +98,6 @@ LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk LOCAL_REQUIRED_MODULES := tzdata include $(BUILD_JAVA_LIBRARY) -# Create the conscrypt library -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-main-java-files-under,crypto) -LOCAL_JAVA_LIBRARIES := core -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVACFLAGS := $(local_javac_flags) -LOCAL_JARJAR_RULES := $(LOCAL_PATH)/crypto/jarjar-rules.txt -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := conscrypt -LOCAL_REQUIRED_MODULES := libjavacrypto -LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk -include $(BUILD_JAVA_LIBRARY) - -# Create the conscrypt library without jarjar for tests -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-main-java-files-under,crypto) -LOCAL_JAVA_LIBRARIES := core -LOCAL_NO_STANDARD_LIBRARIES := true -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) - - ifeq ($(LIBCORE_SKIP_TESTS),) # Make the core-tests library. include $(CLEAR_VARS) @@ -151,23 +126,6 @@ include $(BUILD_STATIC_JAVA_LIBRARY) endif ifeq ($(LIBCORE_SKIP_TESTS),) -# Make the conscrypt-tests library. -include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,crypto) -LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) -LOCAL_NO_STANDARD_LIBRARIES := true -LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit -LOCAL_STATIC_JAVA_LIBRARIES := core-tests-support conscrypt-nojarjar -LOCAL_JAVACFLAGS := $(local_javac_flags) -LOCAL_MODULE_TAGS := optional -LOCAL_MODULE := conscrypt-tests -LOCAL_REQUIRED_MODULES := libjavacrypto -LOCAL_JARJAR_RULES := $(LOCAL_PATH)/crypto/jarjar-rules.txt -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) @@ -234,32 +192,6 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_REQUIRED_MODULES := tzdata-host include $(BUILD_HOST_JAVA_LIBRARY) - # Make the conscrypt-hostdex library - include $(CLEAR_VARS) - LOCAL_SRC_FILES := $(call all-main-java-files-under,crypto) - LOCAL_JAVA_LIBRARIES := core-hostdex - LOCAL_NO_STANDARD_LIBRARIES := true - LOCAL_JAVACFLAGS := $(local_javac_flags) - LOCAL_JARJAR_RULES := $(LOCAL_PATH)/crypto/jarjar-rules.txt - LOCAL_BUILD_HOST_DEX := true - LOCAL_MODULE_TAGS := optional - LOCAL_MODULE := conscrypt-hostdex - LOCAL_REQUIRED_MODULES := libjavacrypto - LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk - include $(BUILD_HOST_JAVA_LIBRARY) - - # Make the conscrypt-hostdex-nojarjar for tests - include $(CLEAR_VARS) - LOCAL_SRC_FILES := $(call all-main-java-files-under,crypto) - LOCAL_JAVA_LIBRARIES := core-hostdex - LOCAL_NO_STANDARD_LIBRARIES := true - LOCAL_JAVACFLAGS := $(local_javac_flags) - LOCAL_BUILD_HOST_DEX := true - LOCAL_MODULE_TAGS := optional - LOCAL_MODULE := conscrypt-hostdex-nojarjar - LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk - include $(BUILD_HOST_JAVA_LIBRARY) - # Make the core-tests library. ifeq ($(LIBCORE_SKIP_TESTS),) include $(CLEAR_VARS) @@ -290,22 +222,6 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_BUILD_HOST_DEX := true include $(BUILD_HOST_JAVA_LIBRARY) endif - - # Make the conscrypt-tests library. - ifeq ($(LIBCORE_SKIP_TESTS),) - include $(CLEAR_VARS) - LOCAL_SRC_FILES := $(call all-test-java-files-under,crypto) - LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) - LOCAL_NO_STANDARD_LIBRARIES := true - LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-hostdex core-junit-hostdex core-tests-support-hostdex conscrypt-hostdex-nojarjar - LOCAL_JAVACFLAGS := $(local_javac_flags) - LOCAL_MODULE_TAGS := optional - LOCAL_MODULE := conscrypt-tests-hostdex - LOCAL_REQUIRED_MODULES := libjavacrypto - LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk - LOCAL_BUILD_HOST_DEX := true - include $(BUILD_HOST_JAVA_LIBRARY) - endif endif # |