diff options
author | Brian Swetland <swetland@google.com> | 2009-11-25 13:43:25 -0800 |
---|---|---|
committer | Brian Swetland <swetland@google.com> | 2009-11-25 13:43:25 -0800 |
commit | 2b80317be27e5450d7212b10777992d782dcf90e (patch) | |
tree | 4ba264668526a27e0162ee6419a6eca8dcc476c3 /target/board/Android.mk | |
parent | 636458dd0665f4cca1a208f054a891a97d3fa8de (diff) | |
download | build-2b80317be27e5450d7212b10777992d782dcf90e.tar.gz build-2b80317be27e5450d7212b10777992d782dcf90e.tar.bz2 build-2b80317be27e5450d7212b10777992d782dcf90e.zip |
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.
Diffstat (limited to 'target/board/Android.mk')
-rw-r--r-- | target/board/Android.mk | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/target/board/Android.mk b/target/board/Android.mk index fc2f65132..71370825c 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 |