Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2c9ae905 authored by Treehugger Robot's avatar Treehugger Robot Committed by Automerger Merge Worker
Browse files

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

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

Change-Id: I030c40c0d2eb9e8d7d98eb691f6fdf58bdce3153
parents 61f19204 65f4412c
Loading
Loading
Loading
Loading
+3 −1
Original line number Diff line number Diff line
@@ -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.