From 636458dd0665f4cca1a208f054a891a97d3fa8de Mon Sep 17 00:00:00 2001
From: Mathias Agopian <mathias@google.com>
Date: Mon, 23 Nov 2009 23:14:44 -0800
Subject: [PATCH 1/2] clean step for build.prop

---
 cleanspec.mk | 1 +
 1 file changed, 1 insertion(+)

diff --git a/cleanspec.mk b/cleanspec.mk
index 5bf4278ce6..40b62e0938 100644
--- a/cleanspec.mk
+++ b/cleanspec.mk
@@ -105,6 +105,7 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/obj/APPS)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/app)
 $(call add-clean-step, rm -rf $(OUT_DIR)/target/common/obj/APPS)
 $(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
+$(call add-clean-step, rm -rf $(PRODUCT_OUT)/system/build.prop)
 
 # ************************************************
 # NEWER CLEAN STEPS MUST BE AT THE END OF THE LIST

From 2b80317be27e5450d7212b10777992d782dcf90e Mon Sep 17 00:00:00 2001
From: Brian Swetland <swetland@google.com>
Date: Wed, 25 Nov 2009 13:43:25 -0800
Subject: [PATCH 2/2] only auto-generate board= requirement if a board-info
 file is not specified

If a board-info file is specified (as is usually the case) we should honor
its requirements.
---
 target/board/Android.mk | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/target/board/Android.mk b/target/board/Android.mk
index fc2f65132b..71370825c4 100644
--- a/target/board/Android.mk
+++ b/target/board/Android.mk
@@ -45,7 +45,8 @@ INSTALLED_ANDROID_INFO_TXT_TARGET := $(PRODUCT_OUT)/android-info.txt
 board_info_txt := $(wildcard $(TARGET_DEVICE_DIR)/board-info.txt)
 $(INSTALLED_ANDROID_INFO_TXT_TARGET): $(board_info_txt)
 	$(call pretty,"Generated: ($@)")
-	$(hide) echo "board=$(TARGET_BOOTLOADER_BOARD_NAME)" > $@
 ifdef board_info_txt
 	$(hide) cat $< >> $@
+else
+	$(hide) echo "board=$(TARGET_BOOTLOADER_BOARD_NAME)" > $@
 endif