StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
Merge commit '2b80317be27e5450d7212b10777992d782dcf90e' into eclair-mr2

* 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:20 -08:00
committed by Android Git Automerger
parent 69ed23d097 2b80317be2
commit 8c1eeffe43
1 changed files with 2 additions and 1 deletions
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) board_info_txt := $(wildcard $(TARGET_DEVICE_DIR)/board-info.txt)
$(INSTALLED_ANDROID_INFO_TXT_TARGET): $(board_info_txt) $(INSTALLED_ANDROID_INFO_TXT_TARGET): $(board_info_txt)
$(call pretty,"Generated: ($@)") $(call pretty,"Generated: ($@)")
$(hide) echo "board=$(TARGET_BOOTLOADER_BOARD_NAME)" > $@
ifdef board_info_txt ifdef board_info_txt
$(hide) cat $< >> $@ $(hide) cat $< >> $@
else
$(hide) echo "board=$(TARGET_BOOTLOADER_BOARD_NAME)" > $@
endif endif