Update Security String to 2017-05-05 on nyc-dev

[android-x86/build.git] / core / version_defaults.mk

diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 86a67a1..a93dc31 100644 (file)
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -43,7 +43,16 @@ ifeq "" "$(PLATFORM_VERSION)"
   # which is the version that we reveal to the end user.
   # Update this value when the platform version changes (rather
   # than overriding it somewhere else).  Can be an arbitrary string.
-  PLATFORM_VERSION := 7.1.1
+
+  # When you add a new PLATFORM_VERSION which will result in a new
+  # PLATFORM_SDK_VERSION please ensure you add a corresponding isAtLeast*
+  # method in the following java file:
+  # frameworks/support/compat/gingerbread/android/support/v4/os/BuildCompat.java
+
+  # When you change PLATFORM_VERSION for a given PLATFORM_SDK_VERSION
+  # please add that PLATFORM_VERSION to the following text file:
+  # cts/tests/tests/os/assets/platform_versions.txt
+  PLATFORM_VERSION := 7.1.2
 endif
 
 ifeq "" "$(PLATFORM_SDK_VERSION)"
@@ -55,6 +64,14 @@ ifeq "" "$(PLATFORM_SDK_VERSION)"
   # intermediate builds).  During development, this number remains at the
   # SDK version the branch is based on and PLATFORM_VERSION_CODENAME holds
   # the code-name of the new development work.
+
+  # When you change PLATFORM_SDK_VERSION please ensure you also update the
+  # corresponding methods for isAtLeast* in the following java file:
+  # frameworks/support/compat/gingerbread/android/support/v4/os/BuildCompat.java
+
+  # 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 := 25
 endif
 
@@ -114,7 +131,7 @@ ifeq "" "$(PLATFORM_SECURITY_PATCH)"
     #  It must be of the form "YYYY-MM-DD" on production devices.
     #  It must match one of the Android Security Patch Level strings of the Public Security Bulletins.
     #  If there is no $PLATFORM_SECURITY_PATCH set, keep it empty.
-      PLATFORM_SECURITY_PATCH := 2017-04-05
+      PLATFORM_SECURITY_PATCH := 2017-05-05
 endif
 
 ifeq "" "$(PLATFORM_BASE_OS)"