commit dbfa1914e5ca308aa696c096addcdd4488f2dbc4
author Mårten Kongstad <amhk@google.com> Wed Oct 25 10:36:34 2023 +0200
committer Mårten Kongstad <amhk@google.com> Wed Oct 25 12:57:07 2023 +0200
tree adee3284dc7a836438ee1eaa3879fd548adf24a4
parent 3cdf279f533a994e8fc8600c0c269c6cb9f85443

Set RELEASE_PLATFORM_SDK_EXTENSION_VERSION to 7

Set RELEASE_PLATFORM_SDK_EXTENSION_VERSION to 7 in all release
configurations, down from 10 which referred to extensions not yet pushed
to AOSP.

Note for the future: RELEASE_PLATFORM_SDK_EXTENSION_VERSION should never
exceed the newest directory in prebuilts/sdk/extensions/.

Bug: 307624631
Test: atest SdkExtensionsTest SdkExtensionsHostTest
Merged-In: I90820c93224e5d3a62edfd20d5a0264f82b7f8e4
Change-Id: Id4ac9afc7d30e76e68d8dfda2ef856a1eaedd2d8

build_config/next.bzl

diff --git a/build_config/next.bzl b/build_config/next.bzl
index f75b690..e852933 100644
--- a/build_config/next.bzl
+++ b/build_config/next.bzl
@@ -27,7 +27,7 @@
 platform_version_flags = [
     value("RELEASE_PLATFORM_VERSION", "UP1A"),
     value("RELEASE_PLATFORM_SDK_VERSION", "34"),
-    value("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", "10"),
+    value("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", "7"),
     value("RELEASE_PLATFORM_SECURITY_PATCH", "2023-12-05"),
     value("RELEASE_PLATFORM_VERSION_CODENAME", "REL"),
     value("RELEASE_PLATFORM_VERSION_ALL_CODENAMES", "REL"),

build_config/trunk_versions.bzl

diff --git a/build_config/trunk_versions.bzl b/build_config/trunk_versions.bzl
index 40eb2f8..974f41f 100644
--- a/build_config/trunk_versions.bzl
+++ b/build_config/trunk_versions.bzl
@@ -20,7 +20,7 @@
 platform_version_flags = [
     value("RELEASE_PLATFORM_VERSION", "ZP1A"),
     value("RELEASE_PLATFORM_SDK_VERSION", "34"),
-    value("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", "10"),
+    value("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", "7"),
     value("RELEASE_PLATFORM_SECURITY_PATCH", "2023-12-05"),
     value("RELEASE_PLATFORM_VERSION_CODENAME", "VanillaIceCream"),
     value("RELEASE_PLATFORM_VERSION_ALL_CODENAMES", "UpsideDownCake,VanillaIceCream"),

build_flags.bzl

diff --git a/build_flags.bzl b/build_flags.bzl
index f556c93..b1d3900 100644
--- a/build_flags.bzl
+++ b/build_flags.bzl
@@ -106,7 +106,7 @@
     flag("RELEASE_PLATFORM_SDK_VERSION", ALL, "34"),
 
     # The sdk extension version of this release configuration.
-    flag("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", ALL, "10"),
+    flag("RELEASE_PLATFORM_SDK_EXTENSION_VERSION", ALL, "7"),
 
     # Set to REL for production platform builds, otherwise the codename string,
     # e.g. UpsideDownCake or VanillaIceCream