commit 9e581ca2cd3151245ce4813d63fe0e5be7e88023
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Jun 18 11:38:14 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Jun 18 11:38:14 2021 +0000
tree 93fae4a1d0c247d74de63f5d4cf18b86b5c38b15
parent 6b27401ca191105b82d2c0aa2d979debf0990c48
parent 33c2dd6d6199eb3ee3cd8f41399f006c3230c3ed

Merge "DO NOT MERGE - Merge RQ3A.210605.005" into stage-aosp-master

core/config.mk

diff --git a/core/config.mk b/core/config.mk
index 43a08d3..e30ff3f 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -792,6 +792,7 @@
     28.0 \
     29.0 \
     30.0 \
+    31.0 \
 
 .KATI_READONLY := \
     PLATFORM_SEPOLICY_COMPAT_VERSIONS \

target/board/Android.mk

diff --git a/target/board/Android.mk b/target/board/Android.mk
index 4dd6b17..142270e 100644
--- a/target/board/Android.mk
+++ b/target/board/Android.mk
@@ -24,8 +24,10 @@
 	$(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.