Revert "Use vFRC version as-is for ToT sepolicy version"
Revert submission 2952245-vfrc_as_tot_sepolicy
Reason for revert: DroidMonitor-triggered revert due to breakage https://android-build.corp.google.com/builds/quarterdeck?branch=git_main&target=mainline_modules_arm64-mainline-userdebug&lkgb=11421838&lkbb=11421957&fkbb=11421841, b/324335916
Reverted changes: /q/submissionid:2952245-vfrc_as_tot_sepolicy
Bug: 324335916
Change-Id: I573db8b1a7f7874e146eea1135594eb0f1b6658f
diff --git a/core/config.mk b/core/config.mk
index c388fc0..fc11405 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -888,9 +888,21 @@
# SEPolicy versions
-# PLATFORM_SEPOLICY_VERSION is a number of the form "YYYYMM" with "YYYYMM"
-# mapping to vFRC version.
-PLATFORM_SEPOLICY_VERSION := $(BOARD_API_LEVEL)
+# PLATFORM_SEPOLICY_VERSION is a number of the form "YYYYMM.0" with "YYYYMM"
+# mapping to vFRC version. This value will be set to 1000000.0 to represent
+# tip-of-tree development that is inherently unstable and thus designed not to
+# work with any shipping vendor policy. This is similar in spirit to how
+# DEFAULT_APP_TARGET_SDK is set.
+sepolicy_vers := $(BOARD_API_LEVEL).0
+
+TOT_SEPOLICY_VERSION := 1000000.0
+ifeq (true,$(RELEASE_BOARD_API_LEVEL_FROZEN))
+ PLATFORM_SEPOLICY_VERSION := $(sepolicy_vers)
+else
+ PLATFORM_SEPOLICY_VERSION := $(TOT_SEPOLICY_VERSION)
+endif
+sepolicy_vers :=
+
BOARD_SEPOLICY_VERS := $(PLATFORM_SEPOLICY_VERSION)
.KATI_READONLY := PLATFORM_SEPOLICY_VERSION BOARD_SEPOLICY_VERS
@@ -907,6 +919,7 @@
.KATI_READONLY := \
PLATFORM_SEPOLICY_COMPAT_VERSIONS \
PLATFORM_SEPOLICY_VERSION \
+ TOT_SEPOLICY_VERSION \
ifeq ($(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS),true)
ifneq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)