From c077b7ccc296e17bafb4edba7bf722c59adfb9da Mon Sep 17 00:00:00 2001 From: Brian Swetland Date: Wed, 25 Nov 2009 13:43:25 -0800 Subject: [PATCH] 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