commit fe487d0c789b94e75c93a2b799f1955c3e4edb10
author Brian Carlstrom <bdc@google.com> Wed Feb 29 18:49:16 2012 -0800
committer Brian Carlstrom <bdc@google.com> Thu Mar 01 09:49:10 2012 -0800
tree cc490fab25de0c6cab87fb8b68e3136e315130ba
parent 31a4a6f5717f645da6b97ccc1e420ae1e1c71ce0

Fix dump-oat-Calculator

also add --host-prefix defaulting to oatdump matching oatexec

Change-Id: I0e82f78510be18dcb09dbb1ec14931fe46173a68

Android.mk

diff --git a/Android.mk b/Android.mk
index 2dd2d8f..0d24024 100644
--- a/Android.mk
+++ b/Android.mk
@@ -154,17 +154,17 @@
 
 .PHONY: dump-oat-core
 dump-oat-core: $(TARGET_CORE_OAT_OUT) $(OATDUMP)
-	$(OATDUMP) --image=$(TARGET_CORE_IMG_OUT) --host-prefix=$(PRODUCT_OUT) --output=/tmp/core.oatdump.txt
+	$(OATDUMP) --image=$(TARGET_CORE_IMG_OUT) --output=/tmp/core.oatdump.txt
 	@echo Output in /tmp/core.oatdump.txt
 
 .PHONY: dump-oat-boot
 dump-oat-boot: $(TARGET_BOOT_OAT_OUT) $(OATDUMP)
-	$(OATDUMP) --image=$(TARGET_BOOT_IMG_OUT) --host-prefix=$(PRODUCT_OUT) --output=/tmp/boot.oatdump.txt
+	$(OATDUMP) --image=$(TARGET_BOOT_IMG_OUT) --output=/tmp/boot.oatdump.txt
 	@echo Output in /tmp/boot.oatdump.txt
 
 .PHONY: dump-oat-Calculator
-dump-oat-Calculator: $(call art-cache-oat,system/app/Calculator.apk) $(TARGET_BOOT_OAT_OUT) $(OATDUMP)
-	$(OATDUMP) --oat-file=$< --boot-image=$(TARGET_BOOT_IMG) --host-prefix=$(PRODUCT_OUT) --output=/tmp/Calculator.oatdump.txt
+dump-oat-Calculator: $(call art-cache-out,system/app/Calculator.apk.oat) $(TARGET_BOOT_IMG_OUT) $(OATDUMP)
+	$(OATDUMP) --oat-file=$< --output=/tmp/Calculator.oatdump.txt
 	@echo Output in /tmp/Calculator.oatdump.txt