Updating platform SDK version for R
* Update SDK level and make REL
* Update GSI lib list
Test: build + boot
bug:150281259
Exempt-From-Owner-Approval: merge conflict resolution
Change-Id: Ib286bb7499e4857842633003b8ef98b8d0fb3e77
Merged-In: Ib286bb7499e4857842633003b8ef98b8d0fb3e77
diff --git a/core/config.mk b/core/config.mk
index 69e2b5c..93c83a7 100644
--- a/core/config.mk
+++ b/core/config.mk
@@ -835,7 +835,7 @@
# 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 := 29
+sepolicy_major_vers := 30
sepolicy_minor_vers := 0
ifneq ($(sepolicy_major_vers), $(PLATFORM_SDK_VERSION))
@@ -857,6 +857,7 @@
27.0 \
28.0 \
29.0 \
+ 30.0 \
.KATI_READONLY := \
PLATFORM_SEPOLICY_COMPAT_VERSIONS \
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index fd0edef..c1392d6 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -88,7 +88,7 @@
# The last stable version name of the platform that was released. During
# development, this stays at that previous version, while the codename indicates
# further work based on the previous version.
-PLATFORM_VERSION_LAST_STABLE := 10
+PLATFORM_VERSION_LAST_STABLE := 11
.KATI_READONLY := PLATFORM_VERSION_LAST_STABLE
# These are the current development codenames, if the build is not a final
@@ -151,7 +151,7 @@
# 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 := 29
+ PLATFORM_SDK_VERSION := 30
endif
.KATI_READONLY := PLATFORM_SDK_VERSION