diff options
| author | 2021-06-18 07:05:19 +0000 | |
|---|---|---|
| committer | 2021-06-18 07:05:19 +0000 | |
| commit | 2c9ae905cb05cd3a20a68f15dbf6830e3e2f9ccb (patch) | |
| tree | 780f402c51c280188b2f0ed0fecc9a4c744b0f7e | |
| parent | 61f19204f54fc95554babd5cd2d0159b483a382a (diff) | |
| parent | 65f4412cc81d2922c7cd0e53a37ae53a1b93c5b1 (diff) | |
Merge "android-info.txt: do not output 'board=' if no board_name" am: 65f4412cc8
Original change: https://android-review.googlesource.com/c/platform/build/+/1726355
Change-Id: I030c40c0d2eb9e8d7d98eb691f6fdf58bdce3153
| -rw-r--r-- | target/board/Android.mk | 4 |
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. |