aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorandroid-build-team Robot <android-build-team-robot@google.com>2019-05-16 00:13:07 +0000
committerandroid-build-team Robot <android-build-team-robot@google.com>2019-05-16 00:13:07 +0000
commitfbb9c7eb3556d92a8afbbc247cca35c7d4e59978 (patch)
treeb1b5e87921214323e8fe3f4bc67a5e3e508d5ad3
parent8c4e4ad32eca921f8067ea4f3b3ec58d3b827b21 (diff)
parente65302190b96aea16a631048556b1bbafea16664 (diff)
downloadbuild_soong-fbb9c7eb3556d92a8afbbc247cca35c7d4e59978.tar.gz
build_soong-fbb9c7eb3556d92a8afbbc247cca35c7d4e59978.tar.bz2
build_soong-fbb9c7eb3556d92a8afbbc247cca35c7d4e59978.zip
Merge cherrypicks of [7534696, 7534697, 7534649, 7533589, 7533590, 7533591, 7533592, 7534653, 7534654, 7534758, 7534628, 7534655, 7534629, 7534630, 7533594, 7534779, 7534771, 7535018, 7534136, 7533725, 7533726, 7535065, 7535066, 7533727, 7534940, 7533192, 7535067, 7535023, 7535024, 7533728, 7533729, 7533730, 7533731, 7535026, 7533732, 7534941, 7534942, 7534943, 7535068, 7535069, 7534944, 7535028, 7535070, 7535071, 7535073, 7535534, 7535029, 7535030, 7535077, 7535600, 7535602, 7535037, 7535718, 7535719, 7534948, 7535609, 7535610, 7535725, 7534949, 7535611, 7535612, 7535780, 7535613, 7535614, 7534951, 7535726, 7534952, 7535838, 7535727] into qt-release
Change-Id: Ib5cd0f416115bf9a7ecccc2bb4b4cbbf1dd4a8aa
-rw-r--r--android/api_levels.go1
1 files changed, 1 insertions, 0 deletions
diff --git a/android/api_levels.go b/android/api_levels.go
index 51d47038..2f70f620 100644
--- a/android/api_levels.go
+++ b/android/api_levels.go
@@ -71,6 +71,7 @@ func getApiLevelsMap(config Config) map[string]int {
"O": 26,
"O-MR1": 27,
"P": 28,
+ "Q": 29,
}
for i, codename := range config.PlatformVersionCombinedCodenames() {
apiLevelsMap[codename] = baseApiLevel + i