diff options
author | Nicolas Geoffray <ngeoffray@google.com> | 2014-10-06 14:55:06 +0100 |
---|---|---|
committer | Nicolas Geoffray <ngeoffray@google.com> | 2014-10-06 15:08:30 +0000 |
commit | 1ffa074c9be5c77b9c0a3536bf18665fdc0c5c88 (patch) | |
tree | 85da1d45ac1e6f9629b8ba00ac993d29cc3b1f44 /Android.mk | |
parent | e6b73ea6719a2c91433b560fd3441d79945edc18 (diff) | |
download | art-1ffa074c9be5c77b9c0a3536bf18665fdc0c5c88.zip art-1ffa074c9be5c77b9c0a3536bf18665fdc0c5c88.tar.gz art-1ffa074c9be5c77b9c0a3536bf18665fdc0c5c88.tar.bz2 |
Make which dex2oat version to use configurable.
Change-Id: I86503a51538c0b48ad96e8624b81461c2ba3279a
Diffstat (limited to 'Android.mk')
-rw-r--r-- | Android.mk | 4 |
1 files changed, 2 insertions, 2 deletions
@@ -329,9 +329,9 @@ else .PHONY: oat-target-$(1) oat-target-$(1): $$(OUT_OAT_FILE) -$$(OUT_OAT_FILE): $(PRODUCT_OUT)/$(1) $(DEFAULT_DEX_PREOPT_BUILT_IMAGE) $(DEX2OATD_DEPENDENCY) +$$(OUT_OAT_FILE): $(PRODUCT_OUT)/$(1) $(DEFAULT_DEX_PREOPT_BUILT_IMAGE) $(DEX2OAT_DEPENDENCY) @mkdir -p $$(dir $$@) - $(DEX2OATD) --runtime-arg -Xms$(DEX2OAT_XMS) --runtime-arg -Xmx$(DEX2OAT_XMX) \ + $(DEX2OAT) --runtime-arg -Xms$(DEX2OAT_XMS) --runtime-arg -Xmx$(DEX2OAT_XMX) \ --boot-image=$(DEFAULT_DEX_PREOPT_BUILT_IMAGE) --dex-file=$(PRODUCT_OUT)/$(1) \ --dex-location=/$(1) --oat-file=$$@ \ --instruction-set=$(DEX2OAT_TARGET_ARCH) \ |