commit 13c492bce0daf19cbea71670b9e1fe2df2e153e5
author Brian Carlstrom <bdc@google.com> Thu Mar 22 17:09:17 2012 -0700
committer Brian Carlstrom <bdc@google.com> Thu Mar 22 17:13:55 2012 -0700
tree 7bcd37b4af8b17172f5ab8c72aa38349197b33ce
parent 634eb2eb14f87753519d0ef2c5f256e55888f378

Make oatdump work on the host by not defaulting --host-prefix if it is explictly set

Change-Id: I188dda58c86c374f50492461814204313a72605e

Android.mk

diff --git a/Android.mk b/Android.mk
index 5e9012e..ec3e4b2 100644
--- a/Android.mk
+++ b/Android.mk
@@ -183,12 +183,20 @@
 dump-oat: dump-oat-core dump-oat-boot dump-oat-Calculator
 
 .PHONY: dump-oat-core
-dump-oat-core: $(TARGET_CORE_OAT_OUT) $(OATDUMP)
-	$(OATDUMP) --image=$(TARGET_CORE_IMG_OUT) --output=/tmp/core.oatdump.txt
-	@echo Output in /tmp/core.oatdump.txt
+dump-oat-core: dump-oat-core-host dump-oat-core-target
+
+.PHONY: dump-oat-core-host
+dump-oat-core-host: $(HOST_CORE_IMG_OUT) $(OATDUMP)
+	$(OATDUMP) --image=$(HOST_CORE_IMG_OUT) --output=/tmp/core.host.oatdump.txt --host-prefix=""
+	@echo Output in /tmp/core.host.oatdump.txt
+
+.PHONY: dump-oat-core-target
+dump-oat-core-target: $(TARGET_CORE_IMG_OUT) $(OATDUMP)
+	$(OATDUMP) --image=$(TARGET_CORE_IMG_OUT) --output=/tmp/core.target.oatdump.txt
+	@echo Output in /tmp/core.target.oatdump.txt
 
 .PHONY: dump-oat-boot
-dump-oat-boot: $(TARGET_BOOT_OAT_OUT) $(OATDUMP)
+dump-oat-boot: $(TARGET_BOOT_IMG_OUT) $(OATDUMP)
 	$(OATDUMP) --image=$(TARGET_BOOT_IMG_OUT) --output=/tmp/boot.oatdump.txt
 	@echo Output in /tmp/boot.oatdump.txt