diff options
| author | The Android Open Source Project <initial-contribution@android.com> | 2013-11-22 11:22:18 -0800 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2013-11-22 11:22:18 -0800 |
| commit | 6be37f5f3d46daecf6c0d3e1078e25cca3ce4732 (patch) | |
| tree | ad05737acbd8b020b5b39cbe011c8c83abd886ca /JavaLibrary.mk | |
| parent | c176521cb700b86cac37d8bec6fda4c7f3b07d79 (diff) | |
| parent | 0a56e711dc7b1a310f57c58f5cb61add4808f713 (diff) | |
| download | libcore-6be37f5f3d46daecf6c0d3e1078e25cca3ce4732.zip libcore-6be37f5f3d46daecf6c0d3e1078e25cca3ce4732.tar.gz libcore-6be37f5f3d46daecf6c0d3e1078e25cca3ce4732.tar.bz2 | |
Merge commit '0a56e711dc7b1a310f57c58f5cb61add4808f713' into HEAD
Change-Id: I883352e71c7d5f057764bdb822836023e57b6ba9
Diffstat (limited to 'JavaLibrary.mk')
| -rw-r--r-- | JavaLibrary.mk | 46 |
1 files changed, 30 insertions, 16 deletions
diff --git a/JavaLibrary.mk b/JavaLibrary.mk index 22ab61a..8252954 100644 --- a/JavaLibrary.mk +++ b/JavaLibrary.mk @@ -50,19 +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 xml) -core_src_files += $(call all-main-java-files-under,libdvm) +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) - 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 @@ -74,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) ifeq ($(LIBCORE_SKIP_TESTS),) # Make the core-tests library. @@ -160,23 +167,30 @@ include $(BUILD_HOST_JAVA_LIBRARY) 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 core-tests library. |