Merge "Revert "O is API 26"" into oc-dev

This commit is contained in:
Ian Pedowitz 2017-05-04 00:07:05 +00:00 committed by Android (Google) Code Review
commit 47859a9370

View file

@ -10,7 +10,7 @@ LOCAL_PATH:= $(call my-dir)
# is made which breaks compatibility with the previous platform sepolicy version, # is made which breaks compatibility with the previous platform sepolicy version,
# not just on every increase in PLATFORM_SDK_VERSION. The minor version should # not just on every increase in PLATFORM_SDK_VERSION. The minor version should
# be reset to 0 on every bump of the PLATFORM_SDK_VERSION. # be reset to 0 on every bump of the PLATFORM_SDK_VERSION.
sepolicy_major_vers := 26 sepolicy_major_vers := 25
sepolicy_minor_vers := 0 sepolicy_minor_vers := 0
ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION)) ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION))