OSDN Git Service
(root)
/
android-x86
/
build.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
636458d
)
only auto-generate board= requirement if a board-info file is not specified
author
Brian Swetland
<swetland@google.com>
Wed, 25 Nov 2009 21:43:25 +0000
(13:43 -0800)
committer
Brian Swetland
<swetland@google.com>
Wed, 25 Nov 2009 21:43:25 +0000
(13:43 -0800)
If a board-info file is specified (as is usually the case) we should honor
its requirements.
target/board/Android.mk
patch
|
blob
|
history
diff --git
a/target/board/Android.mk
b/target/board/Android.mk
index
fc2f651
..
7137082
100644
(file)
--- 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