resolve merge conflicts of 6ff975b to master
Test: None (comment only change)
Change-Id: Ib1d948eb7bf9a9638d1989da82a8a3c5c885b5c4
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index dcb3572..91a3325 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -43,6 +43,15 @@
# 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.
+
+ # 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 := O
endif
@@ -58,7 +67,11 @@
# When you change PLATFORM_SDK_VERSION please ensure you also update the
# corresponding methods for isAtLeast* in the following java file:
- # platform/frameworks/support/compat/gingerbread/android/support/v4/os/BuildCompat.java
+ # 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