commit 1ffa074c9be5c77b9c0a3536bf18665fdc0c5c88
author Nicolas Geoffray <ngeoffray@google.com> Mon Oct 06 14:55:06 2014 +0100
committer Nicolas Geoffray <ngeoffray@google.com> Mon Oct 06 15:08:30 2014 +0000
tree 85da1d45ac1e6f9629b8ba00ac993d29cc3b1f44
parent e6b73ea6719a2c91433b560fd3441d79945edc18

Make which dex2oat version to use configurable.

Change-Id: I86503a51538c0b48ad96e8624b81461c2ba3279a

Android.mk

diff --git a/Android.mk b/Android.mk
index 1edd543..9a813fd 100644
--- a/Android.mk
+++ b/Android.mk
@@ -329,9 +329,9 @@
 .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) \