commit 31edec5b9e506cb702818c074ffef4edcc142105
author Brian Carlstrom <bdc@google.com> Sun Oct 16 17:10:24 2011 -0700
committer Brian Carlstrom <bdc@google.com> Sun Oct 16 17:10:24 2011 -0700
tree f7dbe7102b3019df479f0b021ab91c44b232a94b
parent df8dad5f05408c8bab6b5a0cc91572fe8c0aff06

Disable StrictMode when booting with art

Change-Id: I2a19136ec960399f2d492d010e74f4d05817af86

build/Android.oat.mk

diff --git a/build/Android.oat.mk b/build/Android.oat.mk
index 846cda3..00aa8cf 100644
--- a/build/Android.oat.mk
+++ b/build/Android.oat.mk
@@ -47,12 +47,12 @@
 TARGET_CORE_IMG := $(ART_TEST_OUT)/core.art
 
 $(HOST_CORE_OAT): $(HOST_CORE_DEX) $(DEX2OAT_DEPENDENCY)
-	@echo "host dex2oat: $@ ($<)"
+	@echo "host dex2oat: $@ ($?)"
 	@mkdir -p $(dir $@)
 	$(hide) $(DEX2OAT) -Xms16m -Xmx16m $(addprefix --dex-file=,$(filter-out $(DEX2OAT),$^)) --oat=$@ --image=$(HOST_CORE_IMG) --base=$(IMG_HOST_BASE_ADDRESS)
 
 $(TARGET_CORE_OAT): $(TARGET_CORE_DEX) $(DEX2OAT_DEPENDENCY)
-	@echo "target dex2oat: $@ ($<)"
+	@echo "target dex2oat: $@ ($?)"
 	@mkdir -p $(dir $@)
 	$(hide) $(DEX2OAT) -Xms32m -Xmx32m $(addprefix --dex-file=,$(filter-out $(DEX2OAT),$^)) --oat=$@ --image=$(TARGET_CORE_IMG) --base=$(IMG_TARGET_BASE_ADDRESS) --host-prefix=$(PRODUCT_OUT)
 
@@ -68,7 +68,7 @@
 TARGET_BOOT_IMG := $(ART_CACHE_OUT)/boot.art
 
 $(TARGET_BOOT_OAT): $(TARGET_BOOT_DEX) $(DEX2OAT_DEPENDENCY)
-	@echo "target dex2oat: $@ ($<)"
+	@echo "target dex2oat: $@ ($?)"
 	@mkdir -p $(dir $@)
 	$(hide) $(DEX2OAT) -Xms256m -Xmx256m $(addprefix --dex-file=,$(filter-out $(DEX2OAT),$^)) --oat=$@ --image=$(TARGET_BOOT_IMG) --base=$(IMG_TARGET_BASE_ADDRESS) --host-prefix=$(PRODUCT_OUT)