StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "android-info.txt: do not output 'board=' if no board_name" am: 65f4412cc8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/+/1726355

Change-Id: I030c40c0d2eb9e8d7d98eb691f6fdf58bdce3153
This commit is contained in:
Treehugger Robot
2021-06-18 07:05:19 +00:00
committed by Automerger Merge Worker
parent 61f19204f5 65f4412cc8
commit 2c9ae905cb
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
target/board/Android.mk
View File

@@ -24,8 +24,10 @@ $(INSTALLED_ANDROID_INFO_TXT_TARGET): $(board_info_txt) build/make/tools/check_r
$(call pretty,"Generated: ($@)") $(call pretty,"Generated: ($@)")
ifdef board_info_txt ifdef board_info_txt
$(hide) grep -v '#' $< > $@ $(hide) grep -v '#' $< > $@
else else ifdef TARGET_BOOTLOADER_BOARD_NAME
$(hide) echo "board=$(TARGET_BOOTLOADER_BOARD_NAME)" > $@ $(hide) echo "board=$(TARGET_BOOTLOADER_BOARD_NAME)" > $@
else
$(hide) echo "" > $@
endif endif
# Copy compatibility metadata to the device. # Copy compatibility metadata to the device.