diff options
author | Brian Carlstrom <bdc@google.com> | 2013-11-14 23:44:56 -0800 |
---|---|---|
committer | Ying Wang <wangying@google.com> | 2013-12-17 14:44:00 -0800 |
commit | ced4bff58e76a16ebce3a35ed24aadc8490ca39b (patch) | |
tree | 3fd4911a8f7fbd01f2813f4edf28664124c5d939 /core/dex_preopt_libart.mk | |
parent | 657eadd4b78b91185ca2042ffb7f92be84e6c1c4 (diff) | |
download | build-ced4bff58e76a16ebce3a35ed24aadc8490ca39b.zip build-ced4bff58e76a16ebce3a35ed24aadc8490ca39b.tar.gz build-ced4bff58e76a16ebce3a35ed24aadc8490ca39b.tar.bz2 |
Add DEXPREOPT support for ART
Change-Id: I24d0d7b2a23a769f5d69bd4dc14be22e1475b759
Diffstat (limited to 'core/dex_preopt_libart.mk')
-rw-r--r-- | core/dex_preopt_libart.mk | 96 |
1 files changed, 96 insertions, 0 deletions
diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk new file mode 100644 index 0000000..1e7b193 --- /dev/null +++ b/core/dex_preopt_libart.mk @@ -0,0 +1,96 @@ +#################################### +# dexpreopt support for ART +# +#################################### + +DEX2OAT := $(HOST_OUT_EXECUTABLES)/dex2oat$(HOST_EXECUTABLE_SUFFIX) +DEX2OATD := $(HOST_OUT_EXECUTABLES)/dex2oatd$(HOST_EXECUTABLE_SUFFIX) + +LIBART_COMPILER := $(HOST_OUT_SHARED_LIBRARIES)/libart-compiler$(HOST_SHLIB_SUFFIX) +LIBARTD_COMPILER := $(HOST_OUT_SHARED_LIBRARIES)/libartd-compiler$(HOST_SHLIB_SUFFIX) + +# TODO: for now, override with debug version for better error reporting +DEX2OAT := $(DEX2OATD) +LIBART_COMPILER := $(LIBARTD_COMPILER) + +# By default, do not run rerun dex2oat if the tool changes. +# Comment out the | to force dex2oat to rerun on after all changes. +DEX2OAT_DEPENDENCY := art/runtime/oat.cc # dependency on oat version number +DEX2OAT_DEPENDENCY += art/runtime/image.cc # dependency on image version number +DEX2OAT_DEPENDENCY += | +DEX2OAT_DEPENDENCY += $(DEX2OAT) +DEX2OAT_DEPENDENCY += $(LIBART_COMPILER) + +PRELOADED_CLASSES := frameworks/base/preloaded-classes + +LIBART_BOOT_IMAGE := /$(DEXPREOPT_BOOT_JAR_DIR)/boot.art + +DEFAULT_DEX_PREOPT_BUILT_IMAGE := $(DEXPREOPT_BOOT_JAR_DIR_FULL_PATH)/boot.art +DEFAULT_DEX_PREOPT_INSTALLED_IMAGE := $(PRODUCT_OUT)$(LIBART_BOOT_IMAGE) + +# The rule to install boot.art and boot.oat +$(DEFAULT_DEX_PREOPT_INSTALLED_IMAGE) : $(DEFAULT_DEX_PREOPT_BUILT_IMAGE) | $(ACP) + $(call copy-file-to-target) + $(hide) $(ACP) -fp $(patsubst %.art,%.oat,$<) $(patsubst %.art,%.oat,$@) + +DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := default +ifeq ($(TARGET_CPU_VARIANT),$(filter $(TARGET_CPU_VARIANT),cortex-a15 krait)) +DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES := div +endif + +# start of image reserved address space +LIBART_IMG_HOST_BASE_ADDRESS := 0x60000000 + +ifeq ($(TARGET_ARCH),mips) +LIBART_IMG_TARGET_BASE_ADDRESS := 0x30000000 +else +LIBART_IMG_TARGET_BASE_ADDRESS := 0x60000000 +endif + +######################################################################## +# The full system boot classpath + +# note we use core-libart.jar in place of core.jar for ART. +LIBART_TARGET_BOOT_JARS := $(patsubst core, core-libart,$(DEXPREOPT_BOOT_JARS_MODULES)) +LIBART_TARGET_BOOT_DEX_LOCATIONS := $(foreach jar,$(LIBART_TARGET_BOOT_JARS),/$(DEXPREOPT_BOOT_JAR_DIR)/$(jar).jar) +LIBART_TARGET_BOOT_DEX_FILES := $(foreach jar,$(LIBART_TARGET_BOOT_JARS),$(call intermediates-dir-for,JAVA_LIBRARIES,$(jar),,COMMON)/javalib.jar) + +# The .oat with symbols +LIBART_TARGET_BOOT_OAT_UNSTRIPPED := $(TARGET_OUT_UNSTRIPPED)$(patsubst %.art,%.oat,$(LIBART_BOOT_IMAGE)) + +$(DEFAULT_DEX_PREOPT_BUILT_IMAGE): $(LIBART_TARGET_BOOT_DEX_FILES) $(DEX2OAT_DEPENDENCY) + @echo "target dex2oat: $@ ($?)" + @mkdir -p $(dir $@) + @mkdir -p $(dir $(LIBART_TARGET_BOOT_OAT_UNSTRIPPED)) + $(hide) $(DEX2OAT) --runtime-arg -Xms256m --runtime-arg -Xmx256m --image-classes=$(PRELOADED_CLASSES) \ + $(addprefix --dex-file=,$(LIBART_TARGET_BOOT_DEX_FILES)) \ + $(addprefix --dex-location=,$(LIBART_TARGET_BOOT_DEX_LOCATIONS)) \ + --oat-symbols=$(LIBART_TARGET_BOOT_OAT_UNSTRIPPED) \ + --oat-file=$(patsubst %.art,%.oat,$@) \ + --oat-location=$(patsubst %.art,%.oat,$(LIBART_BOOT_IMAGE)) \ + --image=$@ --base=$(LIBART_IMG_TARGET_BASE_ADDRESS) \ + --instruction-set=$(TARGET_ARCH) --instruction-set-features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) \ + --host-prefix=$(DEXPREOPT_PRODUCT_DIR_FULL_PATH) --android-root=$(PRODUCT_OUT)/system + + +######################################################################## +# For a single jar or APK + +# $(1): the boot image to use +# $(2): the input .jar or .apk file +# $(3): the input .jar or .apk target location +# $(4): the output .odex file +define dex2oat-one-file +$(hide) rm -f $(4) +$(hide) mkdir -p $(dir $(4)) +$(hide) $(DEX2OAT) \ + --runtime-arg -Xms64m --runtime-arg -Xmx64m \ + --boot-image=$(1) \ + --dex-file=$(2) \ + --dex-location=$(3) \ + --oat-file=$(4) \ + --host-prefix=$(DEXPREOPT_PRODUCT_DIR_FULL_PATH) \ + --android-root=$(PRODUCT_OUT)/system \ + --instruction-set=$(TARGET_ARCH) \ + --instruction-set-features=$(DEX2OAT_TARGET_INSTRUCTION_SET_FEATURES) +endef |