diff options
| author | Ying Wang <wangying@google.com> | 2011-06-13 17:36:08 -0700 |
|---|---|---|
| committer | Ying Wang <wangying@google.com> | 2011-06-13 17:36:08 -0700 |
| commit | dc31d76b5d2dcebbd629ff4e54d058aa1cfba5b3 (patch) | |
| tree | caaaad20c51d2569cab3fdea417e873400c0e3ae /target/board/Android.mk | |
| parent | 8bfaa68b533c34a23348792151e216588ab5b5e3 (diff) | |
| download | build-dc31d76b5d2dcebbd629ff4e54d058aa1cfba5b3.zip build-dc31d76b5d2dcebbd629ff4e54d058aa1cfba5b3.tar.gz build-dc31d76b5d2dcebbd629ff4e54d058aa1cfba5b3.tar.bz2 | |
Use TARGET_BOARD_INFO_FILE to locate board-info.txt
So board-info.txt can be inherited from the parent device.
Change-Id: I5d99a2483b9a325e475f3c602d9e0f5d2b95e80c
Diffstat (limited to 'target/board/Android.mk')
| -rw-r--r-- | target/board/Android.mk | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/target/board/Android.mk b/target/board/Android.mk index 54ee9e7..58164f6 100644 --- a/target/board/Android.mk +++ b/target/board/Android.mk @@ -27,10 +27,14 @@ endif # with everything else. # # If the file "board-info.txt" appears in $(TARGET_DEVICE_DIR), -# it will be appended to the output file. +# it will be used; otherwise TARGET_BOARD_INFO_FILE is used, which +# can be set in BoardConfig.mk. # 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) +endif $(INSTALLED_ANDROID_INFO_TXT_TARGET): $(board_info_txt) $(call pretty,"Generated: ($@)") ifdef board_info_txt |