diff options
| author | Nicolas Geoffray <ngeoffray@google.com> | 2014-03-25 11:14:26 +0000 |
|---|---|---|
| committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-04-01 08:43:26 +0100 |
| commit | ed154c3ba63c748432198758e54dcb0f2668e353 (patch) | |
| tree | a45d155cf9d336a72595bf01141a7cf92f28e547 /core/dex_preopt_libart.mk | |
| parent | fa97fe67d32860e498acd59eabb7dbc71ca2ff31 (diff) | |
| download | build-ed154c3ba63c748432198758e54dcb0f2668e353.zip build-ed154c3ba63c748432198758e54dcb0f2668e353.tar.gz build-ed154c3ba63c748432198758e54dcb0f2668e353.tar.bz2 | |
Use debug versions of dex2oat explicitly.
Change-Id: Ie7c238908a5739af752a08fec1a04914026a8f96
Diffstat (limited to 'core/dex_preopt_libart.mk')
| -rw-r--r-- | core/dex_preopt_libart.mk | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/core/dex_preopt_libart.mk b/core/dex_preopt_libart.mk index 0318505..f8a7467 100644 --- a/core/dex_preopt_libart.mk +++ b/core/dex_preopt_libart.mk @@ -9,10 +9,6 @@ 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 @@ -21,6 +17,10 @@ DEX2OAT_DEPENDENCY += | DEX2OAT_DEPENDENCY += $(DEX2OAT) DEX2OAT_DEPENDENCY += $(LIBART_COMPILER) +DEX2OATD_DEPENDENCY := $(DEX2OAT_DEPENDENCY) +DEX2OATD_DEPENDENCY += $(DEX2OATD) +DEX2OATD_DEPENDENCY += $(LIBARTD_COMPILER) + PRELOADED_CLASSES := frameworks/base/preloaded-classes LIBART_BOOT_IMAGE := /$(DEXPREOPT_BOOT_JAR_DIR)/boot.art @@ -57,11 +57,12 @@ LIBART_TARGET_BOOT_DEX_FILES := $(foreach jar,$(LIBART_TARGET_BOOT_JARS),$(call # 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) +# Use dex2oat debug version for better error reporting +$(DEFAULT_DEX_PREOPT_BUILT_IMAGE): $(LIBART_TARGET_BOOT_DEX_FILES) $(DEX2OATD_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) \ + $(hide) $(DEX2OATD) --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) \ @@ -82,7 +83,7 @@ $(DEFAULT_DEX_PREOPT_BUILT_IMAGE): $(LIBART_TARGET_BOOT_DEX_FILES) $(DEX2OAT_DEP define dex2oat-one-file $(hide) rm -f $(4) $(hide) mkdir -p $(dir $(4)) -$(hide) $(DEX2OAT) \ +$(hide) $(DEX2OATD) \ --runtime-arg -Xms64m --runtime-arg -Xmx64m \ --boot-image=$(1) \ --dex-file=$(2) \ |