aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2021-06-18 06:51:55 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2021-06-18 06:51:55 +0000
commit65f4412cc81d2922c7cd0e53a37ae53a1b93c5b1 (patch)
tree33e147598d33d9cedfbab3b1823296087b4d43a1
parent56bed0bcf1ebafe2b3638927527387c62809dbff (diff)
parent9346c4e2ad4556cee9033c9eb10c5df4a28b4446 (diff)
downloadbuild-65f4412cc81d2922c7cd0e53a37ae53a1b93c5b1.tar.gz
Merge "android-info.txt: do not output 'board=' if no board_name"
-rw-r--r--target/board/Android.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/target/board/Android.mk b/target/board/Android.mk
index 4dd6b17e33..142270ee58 100644
--- a/target/board/Android.mk
+++ b/target/board/Android.mk
@@ -24,8 +24,10 @@ $(INSTALLED_ANDROID_INFO_TXT_TARGET): $(board_info_txt) build/make/tools/check_r
$(call pretty,"Generated: ($@)")
ifdef board_info_txt
$(hide) grep -v '#' $< > $@
-else
+else ifdef TARGET_BOOTLOADER_BOARD_NAME
$(hide) echo "board=$(TARGET_BOOTLOADER_BOARD_NAME)" > $@
+else
+ $(hide) echo "" > $@
endif
# Copy compatibility metadata to the device.