Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86457049 authored by Inseob Kim's avatar Inseob Kim Committed by Automerger Merge Worker
Browse files

Merge "Revert^2 "Use vFRC version as-is for ToT sepolicy version"" into main... 

Merge "Revert^2 "Use vFRC version as-is for ToT sepolicy version"" into main am: 5fd1645f am: 31051a56

Original change: https://android-review.googlesource.com/c/platform/build/+/2960347



Change-Id: I0e6038e9f360544a15d38596053bc4a96cce20e5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents e5833d64 31051a56

core/config.mk

+3 −16
Original line number Diff line number Diff line
@@ -884,21 +884,9 @@ BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE)) 


# SEPolicy versions



# 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 :=



# PLATFORM_SEPOLICY_VERSION is a number of the form "YYYYMM" with "YYYYMM"

# mapping to vFRC version.

PLATFORM_SEPOLICY_VERSION := $(BOARD_API_LEVEL)

BOARD_SEPOLICY_VERS := $(PLATFORM_SEPOLICY_VERSION)

.KATI_READONLY := PLATFORM_SEPOLICY_VERSION BOARD_SEPOLICY_VERS
@@ -915,7 +903,6 @@ PLATFORM_SEPOLICY_COMPAT_VERSIONS := $(filter-out $(PLATFORM_SEPOLICY_VERSION), 
.KATI_READONLY := \

    PLATFORM_SEPOLICY_COMPAT_VERSIONS \

    PLATFORM_SEPOLICY_VERSION \

    TOT_SEPOLICY_VERSION \



ifeq ($(PRODUCT_RETROFIT_DYNAMIC_PARTITIONS),true)

  ifneq ($(PRODUCT_USE_DYNAMIC_PARTITIONS),true)

core/soong_config.mk

+0 −1
Original line number Diff line number Diff line
@@ -230,7 +230,6 @@ $(call add_json_str, SystemExtSepolicyPrebuiltApiDir, $(BOARD_SYSTEM_EXT_PREB 
$(call add_json_str,  ProductSepolicyPrebuiltApiDir,     $(BOARD_PRODUCT_PREBUILT_DIR))



$(call add_json_str,  PlatformSepolicyVersion,           $(PLATFORM_SEPOLICY_VERSION))

$(call add_json_str,  TotSepolicyVersion,                $(TOT_SEPOLICY_VERSION))

$(call add_json_list, PlatformSepolicyCompatVersions,    $(PLATFORM_SEPOLICY_COMPAT_VERSIONS))



$(call add_json_bool, ForceApexSymlinkOptimization,      $(filter true,$(TARGET_FORCE_APEX_SYMLINK_OPTIMIZATION)))