diff options
author | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-05 04:35:46 +0000 |
---|---|---|
committer | android-build-team Robot <android-build-team-robot@google.com> | 2019-06-05 04:35:46 +0000 |
commit | eb1eb3cdb03d67cc2dd344758b5b6d0361631448 (patch) | |
tree | 46c334af167238b875c98eec029263dd6352b609 | |
parent | 8ba74ea7ee8815eeb60480a102253a27586c06e8 (diff) | |
parent | 711d58a3df6731636190c21e230b0d2bea360281 (diff) | |
download | build-eb1eb3cdb03d67cc2dd344758b5b6d0361631448.tar.gz |
Snap for 5617038 from 711d58a3df6731636190c21e230b0d2bea360281 to qt-aml-release
Change-Id: I91e722cb5151e230658e7d0e6fe88a9140a8c722
-rw-r--r-- | core/build_id.mk | 2 | ||||
-rw-r--r-- | core/version_defaults.mk | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/core/build_id.mk b/core/build_id.mk index d3e449d5dd..c5843f85f4 100644 --- a/core/build_id.mk +++ b/core/build_id.mk @@ -18,4 +18,4 @@ # (like "CRB01"). It must be a single word, and is # capitalized by convention. -BUILD_ID=QP1A.190602.001 +BUILD_ID=QP1A.190530.001 diff --git a/core/version_defaults.mk b/core/version_defaults.mk index 4d4d1a5997..6738a77ae5 100644 --- a/core/version_defaults.mk +++ b/core/version_defaults.mk @@ -73,6 +73,11 @@ MAX_PLATFORM_VERSION := # 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 as well as clean up obsolete PLATFORM_VERSION's # in the following text file: @@ -109,6 +114,10 @@ ifndef PLATFORM_SDK_VERSION # 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 |