diff options
| author | Doug Zongker <dougz@android.com> | 2012-01-19 10:43:49 -0800 |
|---|---|---|
| committer | Doug Zongker <dougz@android.com> | 2012-01-19 10:43:49 -0800 |
| commit | 545b7996cc5510310f69227f14e4e4e67e95e80c (patch) | |
| tree | 93101b30801843b0a2df3be98e38aa2533e08432 /target/board/Android.mk | |
| parent | e5ff5907bef42fa9f3eff2e90ad941423dcc91dc (diff) | |
| download | build-545b7996cc5510310f69227f14e4e4e67e95e80c.zip build-545b7996cc5510310f69227f14e4e4e67e95e80c.tar.gz build-545b7996cc5510310f69227f14e4e4e67e95e80c.tar.bz2 | |
prefer an explicitly-set TARGET_BOARD_INFO_FILE
Change-Id: Ie667a4d0070d1f0bbdfe9fa6d96871bcceb959b8
Diffstat (limited to 'target/board/Android.mk')
| -rw-r--r-- | target/board/Android.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/target/board/Android.mk b/target/board/Android.mk index 58164f6..6f3bf91 100644 --- a/target/board/Android.mk +++ b/target/board/Android.mk @@ -26,19 +26,19 @@ endif # device we're building for. This file is typically packaged up # with everything else. # -# If the file "board-info.txt" appears in $(TARGET_DEVICE_DIR), -# it will be used; otherwise TARGET_BOARD_INFO_FILE is used, which -# can be set in BoardConfig.mk. +# If TARGET_BOARD_INFO_FILE (which can be set in BoardConfig.mk) is +# defined, it is used, otherwise board-info.txt is looked for in +# $(TARGET_DEVICE_DIR). # INSTALLED_ANDROID_INFO_TXT_TARGET := $(PRODUCT_OUT)/android-info.txt -board_info_txt := $(wildcard $(TARGET_DEVICE_DIR)/board-info.txt) -ifndef board_info_txt board_info_txt := $(TARGET_BOARD_INFO_FILE) +ifndef board_info_txt +board_info_txt := $(wildcard $(TARGET_DEVICE_DIR)/board-info.txt) endif $(INSTALLED_ANDROID_INFO_TXT_TARGET): $(board_info_txt) $(call pretty,"Generated: ($@)") ifdef board_info_txt - $(hide) cat $< > $@ + $(hide) grep -v '#' $< > $@ else $(hide) echo "board=$(TARGET_BOOTLOADER_BOARD_NAME)" > $@ endif |