commit 648e5e9160fbd3ece4c4ab58370e9cf22e0d76b7
author Brian Carlstrom <bdc@google.com> Tue Oct 11 22:49:18 2011 -0700
committer Brian Carlstrom <bdc@google.com> Tue Oct 11 23:24:23 2011 -0700
tree 8c7c9ceaf62d6d229f8a9ee60f099fdf6507d691
parent c0da31a2aacfc6347cc04c7024aea9cf2e44953e

Disable zygote preloading

Change-Id: I2b0cfdb8f0a66c1bac92f4c67a4be06fa78b6d74

Android.mk

diff --git a/Android.mk b/Android.mk
index 38eb01e..0503f8c 100644
--- a/Android.mk
+++ b/Android.mk
@@ -170,7 +170,7 @@
 
 .PHONY: zygote-oat-process
 zygote-oat-process: $(TARGET_BOOT_OAT) test-art-target-sync
-	sed s/app_process/oat_process/ < system/core/rootdir/init.rc > $(ANDROID_PRODUCT_OUT)/root/init.rc
+	sed -e 's/app_process/oat_process/' -e 's/--start-system-server/--start-system-server --no-preload/' < system/core/rootdir/init.rc > $(ANDROID_PRODUCT_OUT)/root/init.rc
 	rm -f $(ANDROID_PRODUCT_OUT)/boot.img
 	unset ONE_SHOT_MAKEFILE && $(MAKE) showcommands bootimage
 	adb reboot bootloader
@@ -179,7 +179,7 @@
 
 .PHONY: zygote-app-process
 zygote-app-process:
-	sed s/oat_process/app_process/ < system/core/rootdir/init.rc > $(ANDROID_PRODUCT_OUT)/root/init.rc
+	cp system/core/rootdir/init.rc $(ANDROID_PRODUCT_OUT)/root/init.rc
 	rm -f $(ANDROID_PRODUCT_OUT)/boot.img
 	unset ONE_SHOT_MAKEFILE && $(MAKE) showcommands bootimage
 	adb reboot bootloader