Merge "Switch to clang-3625443." am: 296c345be9 am: 7c88a2f902
am: 2b711fb78f
Change-Id: I644f40bab1287a9f8b0a34fb3596a120cc31e61d
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index d1e4b74..6f0787e 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -43,7 +43,16 @@
# 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 @@
# 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