Merge "Add TOT_SEPOLICY_VERSION = 10000.0"

This commit is contained in:
Treehugger Robot
2018-03-30 17:11:36 +00:00
committed by Gerrit Code Review

View File

@@ -879,11 +879,13 @@ sepolicy_minor_vers := 0
ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION)) ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION))
$(error sepolicy_major_version does not match PLATFORM_SDK_VERSION, please update.) $(error sepolicy_major_version does not match PLATFORM_SDK_VERSION, please update.)
endif endif
TOT_SEPOLICY_VERSION := 10000.0
ifneq (REL,$(PLATFORM_VERSION_CODENAME)) ifneq (REL,$(PLATFORM_VERSION_CODENAME))
sepolicy_major_vers := 10000 PLATFORM_SEPOLICY_VERSION := $(TOT_SEPOLICY_VERSION)
sepolicy_minor_vers := 0 else
PLATFORM_SEPOLICY_VERSION := $(join $(addsuffix .,$(sepolicy_major_vers)), $(sepolicy_minor_vers))
endif endif
PLATFORM_SEPOLICY_VERSION := $(join $(addsuffix .,$(sepolicy_major_vers)), $(sepolicy_minor_vers))
sepolicy_major_vers := sepolicy_major_vers :=
sepolicy_minor_vers := sepolicy_minor_vers :=
@@ -892,6 +894,11 @@ PLATFORM_SEPOLICY_COMPAT_VERSIONS := \
26.0 \ 26.0 \
27.0 27.0
.KATI_READONLY := \
PLATFORM_SEPOLICY_COMPAT_VERSIONS \
PLATFORM_SEPOLICY_VERSION \
TOT_SEPOLICY_VERSION \
# ############################################################### # ###############################################################
# Set up final options. # Set up final options.
# ############################################################### # ###############################################################