am 2b80317b: only auto-generate board= requirement if a board-info file is not specified

Merge commit '2b80317be27e5450d7212b10777992d782dcf90e' into eclair-plus-aosp

* commit '2b80317be27e5450d7212b10777992d782dcf90e':
  only auto-generate board= requirement if a board-info file is not specified
This commit is contained in:
Brian Swetland 2009-11-25 14:27:40 -08:00 committed by Android Git Automerger
commit 39710c9b08
1 changed files with 2 additions and 1 deletions

View File

@ -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