tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

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

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

Change-Id: Ifc6964f9757822bdb6ec4aa13f0a8735abb4684f
This commit is contained in:
Treehugger Robot 2021-06-18 07:27:41 +00:00 committed by Automerger Merge Worker
commit 064b7a58fd
1 changed files with 3 additions and 1 deletions
Show stats 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.