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

Commit 040ba077 authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Finalizing P SDK" into pi-dev 

am: 5de065e3

Change-Id: I552ebda180de398512b91addde17d8d48ec60624
parents 85bc17b5 5de065e3

core/config.mk

+1 −1
Original line number Diff line number Diff line
@@ -893,7 +893,7 @@ BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE)) 
# is made which breaks compatibility with the previous platform sepolicy version,

# 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.

sepolicy_major_vers := 27

sepolicy_major_vers := 28

sepolicy_minor_vers := 0



ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION))

core/version_defaults.mk

+2 −2
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ endif 
# please add that PLATFORM_VERSION as well as clean up obsolete PLATFORM_VERSION's

# in the following text file:

# cts/tests/tests/os/assets/platform_versions.txt

PLATFORM_VERSION.PPR1 := P

PLATFORM_VERSION.PPR1 := 9



# These are the current development codenames, if the build is not a final

# release build.  If this is a final release build, it is simply "REL".
@@ -106,7 +106,7 @@ ifndef PLATFORM_SDK_VERSION 
  # When you increment the PLATFORM_SDK_VERSION please ensure you also

  # clear out the following text file of all older PLATFORM_VERSION's:

  # cts/tests/tests/os/assets/platform_versions.txt

  PLATFORM_SDK_VERSION := 27

  PLATFORM_SDK_VERSION := 28

endif



ifndef PLATFORM_VERSION_CODENAME