commit 7eea0e8f0838598c67ef93df3149b8040dcb8f0f
author Shih-wei Liao <sliao@google.com> Mon May 28 23:56:21 2012 -0700
committer Shih-wei Liao <sliao@google.com> Mon May 28 23:56:21 2012 -0700
tree f6258a1e1d58f2af5a94aad52b11ea157ee69b5f
parent 21fc570f14d21d89d1cf9ce050c8797bfc31ce81

Fix oat-target-sync dependency: Use $$(OUT_OAT_FILE) instead of $.

Change-Id: Icf2c41aa648fc71f9a65a1efdaf2be2592d06ddc

Android.mk

diff --git a/Android.mk b/Android.mk
index 77e1a71..9ccb9e4 100644
--- a/Android.mk
+++ b/Android.mk
@@ -187,13 +187,13 @@
 ifeq ($(ONE_SHOT_MAKEFILE),)
 .PHONY: oat-target-$(1)
 oat-target-$(1): $(PRODUCT_OUT)/$(1) $(TARGET_BOOT_IMG_OUT) $(DEX2OAT_DEPENDENCY)
-	$(DEX2OAT) $(PARALLEL_ART_COMPILE_JOBS) --runtime-arg -Xms64m --runtime-arg -Xmx64m --boot-image=$(TARGET_BOOT_IMG_OUT) --dex-file=$(PRODUCT_OUT)/$(1) --dex-location=/$(1) --oat-file=$(OUT_OAT_FILE) --host-prefix=$(PRODUCT_OUT)
+	$(DEX2OAT) $(PARALLEL_ART_COMPILE_JOBS) --runtime-arg -Xms64m --runtime-arg -Xmx64m --boot-image=$(TARGET_BOOT_IMG_OUT) --dex-file=$(PRODUCT_OUT)/$(1) --dex-location=/$(1) --oat-file=$$(OUT_OAT_FILE) --host-prefix=$(PRODUCT_OUT)
 
 else
 .PHONY: oat-target-$(1)
-oat-target-$(1): $(OUT_OAT_FILE)
+oat-target-$(1): $$(OUT_OAT_FILE)
 
-$(OUT_OAT_FILE): $(PRODUCT_OUT)/$(1) $(TARGET_BOOT_IMG_OUT) $(DEX2OAT_DEPENDENCY)
+$$(OUT_OAT_FILE): $(PRODUCT_OUT)/$(1) $(TARGET_BOOT_IMG_OUT) $(DEX2OAT_DEPENDENCY)
 	$(DEX2OAT) $(PARALLEL_ART_COMPILE_JOBS) --runtime-arg -Xms64m --runtime-arg -Xmx64m --boot-image=$(TARGET_BOOT_IMG_OUT) --dex-file=$(PRODUCT_OUT)/$(1) --dex-location=/$(1) --oat-file=$$@ --host-prefix=$(PRODUCT_OUT)
 
 endif