diff options
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 75 |
1 files changed, 68 insertions, 7 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 78c9d13..d3ce43b 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -50,7 +50,7 @@ $(shell cd $(LOCAL_PATH) && ls -d */src/$(1)/{java,resources} 2> /dev/null) endef # The Java files and their associated resources. -core_src_files := $(call all-main-java-files-under,dalvik dex dom json luni support xml) +core_src_files := $(call all-main-java-files-under,dalvik dex dom json luni xml) core_src_files += $(call all-main-java-files-under,libdvm) core_resource_dirs := $(call all-core-resource-dirs,main) test_resource_dirs := $(call all-core-resource-dirs,test) @@ -100,6 +100,7 @@ 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) @@ -118,19 +119,48 @@ include $(BUILD_STATIC_JAVA_LIBRARY) ifeq ($(LIBCORE_SKIP_TESTS),) # Make the core-tests library. include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,crypto dalvik dom harmony-tests json luni support xml) +LOCAL_SRC_FILES := $(call all-test-java-files-under,dalvik dom harmony-tests json luni 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_STATIC_JAVA_LIBRARIES := core-tests-support 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 LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk include $(BUILD_STATIC_JAVA_LIBRARY) endif ifeq ($(LIBCORE_SKIP_TESTS),) +# Make the core-tests-support library. +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(call all-test-java-files-under,support) +LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit +LOCAL_JAVACFLAGS := $(local_javac_flags) +LOCAL_MODULE := core-tests-support +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk +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) @@ -200,6 +230,7 @@ ifeq ($(WITH_HOST_DALVIK),true) 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) @@ -218,19 +249,49 @@ ifeq ($(WITH_HOST_DALVIK),true) # Make the core-tests library. ifeq ($(LIBCORE_SKIP_TESTS),) include $(CLEAR_VARS) - LOCAL_SRC_FILES := $(call all-test-java-files-under,crypto dalvik dom json luni support xml) + LOCAL_SRC_FILES := $(call all-test-java-files-under,dalvik dom json luni xml) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true - LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-hostdex conscrypt-hostdex-nojarjar core-junit-hostdex okhttp-hostdex + LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-hostdex core-junit-hostdex core-tests-support-hostdex okhttp-hostdex LOCAL_STATIC_JAVA_LIBRARIES := sqlite-jdbc-host mockwebserver-host nist-pkix-tests-host LOCAL_JAVACFLAGS := $(local_javac_flags) - LOCAL_JARJAR_RULES := $(LOCAL_PATH)/crypto/jarjar-rules.txt LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-tests-hostdex LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk LOCAL_BUILD_HOST_DEX := true include $(BUILD_HOST_JAVA_LIBRARY) endif + + # Make the core-tests-support library. + ifeq ($(LIBCORE_SKIP_TESTS),) + include $(CLEAR_VARS) + LOCAL_SRC_FILES := $(call all-test-java-files-under,support) + LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) + LOCAL_NO_STANDARD_LIBRARIES := true + LOCAL_JAVA_LIBRARIES := bouncycastle-hostdex core-hostdex core-junit-hostdex + LOCAL_JAVACFLAGS := $(local_javac_flags) + LOCAL_MODULE_TAGS := optional + LOCAL_MODULE := core-tests-support-hostdex + LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk + 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 # |