From d03be092149d2a4fbdef0437666cc020a2babc98 Mon Sep 17 00:00:00 2001 From: Alex Buynytskyy Date: Mon, 1 May 2023 18:56:26 +0000 Subject: [PATCH] Set next sdk_int to previous sdk_int + 1. OS and the finalization scripts use sdk_int - 1 in way too many places. Bug: 275409981 Test: run locally Change-Id: If4896a3eb0a6afadac5dbfd6ad455427d1c23d41 --- tools/finalization/environment.sh | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/tools/finalization/environment.sh b/tools/finalization/environment.sh index 63d1fa0504..b0ed645a46 100755 --- a/tools/finalization/environment.sh +++ b/tools/finalization/environment.sh @@ -12,8 +12,10 @@ export FINAL_PLATFORM_VERSION='15' # Set arbitrary large values for CI. # SDK_VERSION needs to be <61 (lint/libs/lint-api/src/main/java/com/android/tools/lint/detector/api/ApiConstraint.kt) -# Feel free to randomize them once in a while to detect buggy version detection code. -export FINAL_PLATFORM_SDK_VERSION='57' +# There are multiple places where we rely on next SDK version to be previous + 1, e.g. RESOURCES_SDK_INT. +# We might or might not fix this in future, but for now let's keep it +1. +export FINAL_PLATFORM_SDK_VERSION='35' +# Feel free to randomize once in a while to detect buggy version detection code. export FINAL_MAINLINE_EXTENSION='58' # Options: