diff options
| author | Brian Carlstrom <bdc@google.com> | 2013-06-25 15:59:29 -0700 |
|---|---|---|
| committer | Brian Carlstrom <bdc@google.com> | 2013-06-25 16:36:57 -0700 |
| commit | 3711c2119dc25aed312081a77dc028504bd482e1 (patch) | |
| tree | efa193ed5556fc7c018d124d20d13a1736baaaa1 /JavaLibrary.mk | |
| parent | 7278a627727bef76de8f20c8e9f9b305fa30481c (diff) | |
| download | libcore-3711c2119dc25aed312081a77dc028504bd482e1.zip libcore-3711c2119dc25aed312081a77dc028504bd482e1.tar.gz libcore-3711c2119dc25aed312081a77dc028504bd482e1.tar.bz2 | |
Add core-libart.jar alongside core.jar
Change-Id: I4c241d6b44265edd9a9606626b697148f77571f0
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 51 |
1 files changed, 30 insertions, 21 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 0e57401..8cf31d4 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -50,24 +50,21 @@ $(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) - -ifeq ($(WITH_ART),false) -core_src_files += $(call all-main-java-files-under,libdvm) -else -core_src_files += $(call all-main-java-files-under,libart) -endif +common_core_src_files := $(call all-main-java-files-under,dalvik dex dom json luni support xml) core_resource_dirs := $(call all-core-resource-dirs,main) test_resource_dirs := $(call all-core-resource-dirs,test) ifeq ($(EMMA_INSTRUMENT),true) ifneq ($(EMMA_INSTRUMENT_STATIC),true) - core_src_files += $(call all-java-files-under, ../external/emma/core ../external/emma/pregenerated) + common_core_src_files += $(call all-java-files-under, ../external/emma/core ../external/emma/pregenerated) core_resource_dirs += ../external/emma/core/res ../external/emma/pregenerated/res endif endif +libdvm_core_src_files += $(common_core_src_files) $(call all-main-java-files-under,libdvm) +libart_core_src_files += $(common_core_src_files) $(call all-main-java-files-under,libart) + local_javac_flags=-encoding UTF-8 #local_javac_flags+=-Xlint:all -Xlint:-serial,-deprecation,-unchecked local_javac_flags+=-Xmaxwarns 9999999 @@ -79,23 +76,28 @@ local_javac_flags+=-Xmaxwarns 9999999 # Definitions to make the core library. include $(CLEAR_VARS) - -LOCAL_SRC_FILES := $(core_src_files) +LOCAL_SRC_FILES := $(libdvm_core_src_files) LOCAL_JAVA_RESOURCE_DIRS := $(core_resource_dirs) - LOCAL_NO_STANDARD_LIBRARIES := true LOCAL_JAVACFLAGS := $(local_javac_flags) LOCAL_DX_FLAGS := --core-library - LOCAL_MODULE_TAGS := optional LOCAL_MODULE := core LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk LOCAL_REQUIRED_MODULES := tzdata - include $(BUILD_JAVA_LIBRARY) -core-intermediates := ${intermediates} - +include $(CLEAR_VARS) +LOCAL_SRC_FILES := $(libart_core_src_files) +LOCAL_JAVA_RESOURCE_DIRS := $(core_resource_dirs) +LOCAL_NO_STANDARD_LIBRARIES := true +LOCAL_JAVACFLAGS := $(local_javac_flags) +LOCAL_DX_FLAGS := --core-library +LOCAL_MODULE_TAGS := optional +LOCAL_MODULE := core-libart +LOCAL_ADDITIONAL_DEPENDENCIES := $(LOCAL_PATH)/JavaLibrary.mk +LOCAL_REQUIRED_MODULES := tzdata +include $(BUILD_JAVA_LIBRARY) # Create the conscrypt library include $(CLEAR_VARS) @@ -158,23 +160,30 @@ $(LOCAL_INTERMEDIATE_TARGETS): $(TMP_RESOURCE_DIR)$(TMP_RESOURCE_FILE) ifeq ($(WITH_HOST_DALVIK),true) # Definitions to make the core library. - include $(CLEAR_VARS) - - LOCAL_SRC_FILES := $(core_src_files) + LOCAL_SRC_FILES := $(libdvm_core_src_files) LOCAL_JAVA_RESOURCE_DIRS := $(core_resource_dirs) - 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 $(CLEAR_VARS) + LOCAL_SRC_FILES := $(libart_core_src_files) + LOCAL_JAVA_RESOURCE_DIRS := $(core_resource_dirs) + 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 |