aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-06-07 12:12:09 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-06-07 12:12:09 +0000
commit2ae9cfec1afb216054c94b4e16f23493f3ca3f93 (patch)
tree66031957049b54de020032537dd36e4b9c2e8168
parente936241dd7eb6144ccf0f486babb840eebd05bde (diff)
parent6e387b85ed487fdcb8dccdf4bb16916bc5179fea (diff)
downloadbuild-2ae9cfec1afb216054c94b4e16f23493f3ca3f93.tar.gz
Snap for 5626917 from 6e387b85ed487fdcb8dccdf4bb16916bc5179fea to qt-aml-release
Change-Id: Id07c6eccb9ccd1cb92ec38edfd55b3bafc961592
-rw-r--r--core/build_id.mk2
-rw-r--r--core/version_defaults.mk9
2 files changed, 1 insertions, 10 deletions
diff --git a/core/build_id.mk b/core/build_id.mk
index 855ceaa9c2..d3e449d5dd 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.190530.004
+BUILD_ID=QP1A.190602.001
diff --git a/core/version_defaults.mk b/core/version_defaults.mk
index 6738a77ae5..4d4d1a5997 100644
--- a/core/version_defaults.mk
+++ b/core/version_defaults.mk
@@ -73,11 +73,6 @@ 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:
@@ -114,10 +109,6 @@ 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