commit 3d4e684d05a43bb7ae182112b58bd8322fd64b2b
author Brian Carlstrom <bdc@google.com> Mon Jul 28 23:12:58 2014 +0000
committer Brian Carlstrom <bdc@google.com> Wed Aug 06 09:40:48 2014 -0700
tree 04234183b9a2ae7e0a2a89f7c495c77a1fbc529e
parent 38449637b1ee8209e2eb81b3f27f40bb9ab3934f

Revert "Rules depend on DEX2OATD, not DEX2OATD_DEPENDENCY."

This reverts commit b1efe9746724f28773d185c7137c16ca8207ed47.

Change-Id: I5af2fae2c7b72e6ded72f00d3f7d4f306f6703ee

Android.mk

diff --git a/Android.mk b/Android.mk
index b006bfe..451edf1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -309,7 +309,7 @@
 .PHONY: oat-target-$(1)
 oat-target-$(1): $$(OUT_OAT_FILE)
 
-$$(OUT_OAT_FILE): $(PRODUCT_OUT)/$(1) $(DEFAULT_DEX_PREOPT_BUILT_IMAGE) $(DEX2OATD)
+$$(OUT_OAT_FILE): $(PRODUCT_OUT)/$(1) $(DEFAULT_DEX_PREOPT_BUILT_IMAGE) $(DEX2OATD_DEPENDENCY)
 	@mkdir -p $$(dir $$@)
 	$(DEX2OATD) --runtime-arg -Xms$(DEX2OAT_XMS) --runtime-arg -Xmx$(DEX2OAT_XMX) \
 		--boot-image=$(DEFAULT_DEX_PREOPT_BUILT_IMAGE) --dex-file=$(PRODUCT_OUT)/$(1) \