commit e857d8986fb13cd05e30c9c58939580282131b10
author David 'Digit' Turner <digit@google.com> Mon Jul 11 10:46:04 2011 -0700
committer Android Git Automerger <android-git-automerger@android.com> Mon Jul 11 10:46:04 2011 -0700
tree 799485b85e2295a86b578da037d1ad6685c6f5df
parent d48111f800dc67dec87e0da0648293c93beb4b39
parent 6697426a3623c1f90d519a47988ed8d0a8e89f5e

am 6697426a: am c50afe92: merge intel x86 patches into gingerbread branch

* commit '6697426a3623c1f90d519a47988ed8d0a8e89f5e':
  Add missing LOCAL_MODULE_TAGS defns.

Android.mk

diff --git a/Android.mk b/Android.mk
index cfa1e7b..0abe2e1 100644
--- a/Android.mk
+++ b/Android.mk
@@ -174,7 +174,7 @@
 $(file) : $(my_files) 
 	@echo "target Creating: $@"
 	$(hide) cat $^ > $@
-ALL_PREBUILT += $(file)
+#ALL_PREBUILT += $(file)
 
 
 #############################################################################
@@ -189,7 +189,7 @@
 	$(hide) rm -f $@
 	$(hide) dd if=$(grub_stage1) of=$@ bs=512 count=1 2>/dev/null
 	$(hide) dd if=$(grub_stage2) of=$@ bs=512 seek=1 2>/dev/null
-ALL_PREBUILT += $(grub_full)
+#ALL_PREBUILT += $(grub_full)
 
 endif # x86
 endif # ! sim