diff options
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 110 |
1 files changed, 20 insertions, 90 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index f4cde58..8337ab2 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -53,6 +53,7 @@ endef common_core_src_files := $(call all-main-java-files-under,dalvik dex dom json luni xml) core_resource_dirs := $(call all-core-resource-dirs,main) test_resource_dirs := $(call all-core-resource-dirs,test) +test_src_files := $(call all-test-java-files-under,dalvik dom harmony-tests json luni xml) ifeq ($(EMMA_INSTRUMENT),true) ifneq ($(EMMA_INSTRUMENT_STATIC),true) @@ -96,37 +97,15 @@ LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-libart LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk LOCAL_REQUIRED_MODULES := tzdata +# Should not be dex-preopted as it isn't really a Dalvik boot jar or a +# regular java library, but part of the image for ART. +LOCAL_DEX_PREOPT := false 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) -LOCAL_SRC_FILES := $(call all-test-java-files-under,dalvik dom harmony-tests json luni xml) +LOCAL_SRC_FILES := $(test_src_files) LOCAL_JAVA_RESOURCE_DIRS := $(test_resource_dirs) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVA_LIBRARIES := bouncycastle core core-junit okhttp @@ -151,18 +130,14 @@ include $(BUILD_STATIC_JAVA_LIBRARY) endif ifeq ($(LIBCORE_SKIP_TESTS),) -# Make the conscrypt-tests library. +# Make the jsr166-tests library. include $(CLEAR_VARS) -LOCAL_SRC_FILES := $(call all-test-java-files-under,crypto) +LOCAL_SRC_FILES := $(call all-test-java-files-under, jsr166-tests) 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_JAVA_LIBRARIES := core core-junit 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_MODULE := jsr166-tests LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk include $(BUILD_STATIC_JAVA_LIBRARY) endif @@ -201,12 +176,11 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_DX_FLAGS := --core-library - LOCAL_BUILD_HOST_DEX := true LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-hostdex LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk LOCAL_REQUIRED_MODULES := tzdata-host - include $(BUILD_HOST_JAVA_LIBRARY) + include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) include $(CLEAR_VARS) LOCAL_SRC_FILES := $(libart_core_src_files) @@ -214,53 +188,27 @@ ifeq ($(WITH_HOST_DALVIK),true) LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_DX_FLAGS := --core-library - LOCAL_BUILD_HOST_DEX := true LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core-libart-hostdex LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk 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) + # Should not be dex-preopted as it isn't really a Dalvik boot jar or a + # regular java library, but part of the image for ART. + LOCAL_DEX_PREOPT := false + include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) # Make the core-tests library. ifeq ($(LIBCORE_SKIP_TESTS),) include $(CLEAR_VARS) - LOCAL_SRC_FILES := $(call all-test-java-files-under,dalvik dom json luni xml) + LOCAL_SRC_FILES := $(test_src_files) 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 okhttp-hostdex + LOCAL_JAVA_LIBRARIES := bouncycastle-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_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) + include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) endif # Make the core-tests-support library. @@ -268,30 +216,12 @@ ifeq ($(WITH_HOST_DALVIK),true) 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_JAVA_LIBRARIES := bouncycastle-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) + include $(BUILD_HOST_DALVIK_JAVA_LIBRARY) endif endif @@ -319,7 +249,7 @@ include $(CLEAR_VARS) # for shared defintion of libcore_to_document include $(LOCAL_PATH)/Docs.mk -LOCAL_SRC_FILES:=$(call libcore_to_document,$(LOCAL_PATH)) +LOCAL_SRC_FILES := $(libcore_to_document) # rerun doc generation without recompiling the java LOCAL_JAVA_LIBRARIES:= LOCAL_JAVACFLAGS := $(local_javac_flags) |