Merge "Use RELEASE_BOARD_API_LEVEL_FROZEN" into main am: 04acb6d255 am: 23265631b2
Original change: https://android-review.googlesource.com/c/platform/build/+/2919149
Change-Id: I55d7c980a27c80dab736d1a2e1d7e53d6fcefa80
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/core/board_config.mk b/core/board_config.mk
index d462b9b..b4bb013 100644
--- a/core/board_config.mk
+++ b/core/board_config.mk
@@ -999,11 +999,6 @@
endif
BOARD_API_LEVEL := $(RELEASE_BOARD_API_LEVEL)
.KATI_READONLY := BOARD_API_LEVEL
-
- ifdef RELEASE_BOARD_API_LEVEL_FROZEN
- BOARD_API_LEVEL_FROZEN := true
- .KATI_READONLY := BOARD_API_LEVEL_FROZEN
- endif
endif
###########################################
diff --git a/core/config.mk b/core/config.mk
index 9f988ab..355e726 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -896,7 +896,7 @@
sepolicy_vers := $(BOARD_API_LEVEL).0
TOT_SEPOLICY_VERSION := 1000000.0
-ifeq (true,$(BOARD_API_LEVEL_FROZEN))
+ifeq (true,$(RELEASE_BOARD_API_LEVEL_FROZEN))
PLATFORM_SEPOLICY_VERSION := $(sepolicy_vers)
else
PLATFORM_SEPOLICY_VERSION := $(TOT_SEPOLICY_VERSION)
diff --git a/core/main.mk b/core/main.mk
index 649c75c..f5dbad8 100644
--- a/core/main.mk
+++ b/core/main.mk
@@ -311,10 +311,10 @@
ADDITIONAL_VENDOR_PROPERTIES += \
ro.board.api_level=$(BOARD_API_LEVEL)
endif
-# BOARD_API_LEVEL_FROZEN is true when the vendor API surface is frozen.
-ifdef BOARD_API_LEVEL_FROZEN
+# RELEASE_BOARD_API_LEVEL_FROZEN is true when the vendor API surface is frozen.
+ifdef RELEASE_BOARD_API_LEVEL_FROZEN
ADDITIONAL_VENDOR_PROPERTIES += \
- ro.board.api_frozen=$(BOARD_API_LEVEL_FROZEN)
+ ro.board.api_frozen=$(RELEASE_BOARD_API_LEVEL_FROZEN)
endif
# Set build prop. This prop is read by ota_from_target_files when generating OTA,