tequilaOS/platform_build
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Finalizing P SDK" into pi-dev

Browse source 
am: 5de065e3ec

Change-Id: I552ebda180de398512b91addde17d8d48ec60624
This commit is contained in:
Wale Ogunwale 2018-04-13 14:06:43 -07:00 committed by android-build-merger
commit 040ba07736
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
core/config.mk
View file

@ -893,7 +893,7 @@ BUILD_DATETIME_FROM_FILE := $$(cat $(BUILD_DATETIME_FILE))
# 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 := 27 sepolicy_major_vers := 28
sepolicy_minor_vers := 0 sepolicy_minor_vers := 0
ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION)) ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION))

4
core/version_defaults.mk
View file

@ -75,7 +75,7 @@ endif
# please add that PLATFORM_VERSION as well as clean up obsolete PLATFORM_VERSION's # please add that PLATFORM_VERSION as well as clean up obsolete PLATFORM_VERSION's
# in the following text file: # in the following text file:
# cts/tests/tests/os/assets/platform_versions.txt # 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 # 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". # 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 # When you increment the PLATFORM_SDK_VERSION please ensure you also
# clear out the following text file of all older PLATFORM_VERSION's: # clear out the following text file of all older PLATFORM_VERSION's:
# cts/tests/tests/os/assets/platform_versions.txt # cts/tests/tests/os/assets/platform_versions.txt
PLATFORM_SDK_VERSION := 27 PLATFORM_SDK_VERSION := 28
endif endif
ifndef PLATFORM_VERSION_CODENAME ifndef PLATFORM_VERSION_CODENAME