aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--core/config.mk1
-rw-r--r--target/board/Android.mk4
2 files changed, 4 insertions, 1 deletions
diff --git a/core/config.mk b/core/config.mk
index 43a08d3130..e30ff3ff34 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -792,6 +792,7 @@ PLATFORM_SEPOLICY_COMPAT_VERSIONS := \
28.0 \
29.0 \
30.0 \
+ 31.0 \
.KATI_READONLY := \
PLATFORM_SEPOLICY_COMPAT_VERSIONS \
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.