p96705831
/
platform_build
forked from openkylin/platform_build
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Merge commit '8c1eeffe4339530cb76572588330a698bccb622c' into eclair-mr2-plus-aosp

* commit '8c1eeffe4339530cb76572588330a698bccb622c':
  only auto-generate board= requirement if a board-info file is not specified
This commit is contained in:
Brian Swetland 2009-11-25 14:31:12 -08:00 committed by Android Git Automerger
parent d7fbf48cea 8c1eeffe43
commit 600b4bb655
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
target/board/Android.mk
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