diff options
| author | 2024-04-16 09:58:18 +0000 | |
|---|---|---|
| committer | 2024-04-16 09:58:18 +0000 | |
| commit | ee76dc3e216fcbc3fee08f988c45374bf445c87f (patch) | |
| tree | 8c5422415ab1b5886dbec0d7af9b5b5bad6e452b | |
| parent | 12294f5ed6d73f268b9af676541d8879a8474034 (diff) | |
| parent | 5c7b9120c5a9e5792fa7713a3323b65ef5c1a871 (diff) | |
Update soong to use flag for min supported sdk am: ba270c503a am: 5c7b9120c5
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3037607
Change-Id: I235a8af79b560c3cb7558d05eaa54b22e880112d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | android/config.go | 6 | ||||
| -rw-r--r-- | android/variable.go | 33 |
2 files changed, 21 insertions, 18 deletions
diff --git a/android/config.go b/android/config.go index 2baa27cc3..40321a18b 100644 --- a/android/config.go +++ b/android/config.go @@ -954,7 +954,11 @@ func (c *config) PlatformPreviewSdkVersion() string { } func (c *config) PlatformMinSupportedTargetSdkVersion() string { - return String(c.productVariables.Platform_min_supported_target_sdk_version) + var val, ok = c.productVariables.BuildFlags["RELEASE_PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION"] + if !ok { + return "" + } + return val } func (c *config) PlatformBaseOS() string { diff --git a/android/variable.go b/android/variable.go index ddd2c10ef..0c7af119b 100644 --- a/android/variable.go +++ b/android/variable.go @@ -202,23 +202,22 @@ type ProductVariables struct { BuildThumbprintFile *string `json:",omitempty"` DisplayBuildNumber *bool `json:",omitempty"` - Platform_display_version_name *string `json:",omitempty"` - Platform_version_name *string `json:",omitempty"` - Platform_sdk_version *int `json:",omitempty"` - Platform_sdk_codename *string `json:",omitempty"` - Platform_sdk_version_or_codename *string `json:",omitempty"` - Platform_sdk_final *bool `json:",omitempty"` - Platform_sdk_extension_version *int `json:",omitempty"` - Platform_base_sdk_extension_version *int `json:",omitempty"` - Platform_version_active_codenames []string `json:",omitempty"` - Platform_version_all_preview_codenames []string `json:",omitempty"` - Platform_systemsdk_versions []string `json:",omitempty"` - Platform_security_patch *string `json:",omitempty"` - Platform_preview_sdk_version *string `json:",omitempty"` - Platform_min_supported_target_sdk_version *string `json:",omitempty"` - Platform_base_os *string `json:",omitempty"` - Platform_version_last_stable *string `json:",omitempty"` - Platform_version_known_codenames *string `json:",omitempty"` + Platform_display_version_name *string `json:",omitempty"` + Platform_version_name *string `json:",omitempty"` + Platform_sdk_version *int `json:",omitempty"` + Platform_sdk_codename *string `json:",omitempty"` + Platform_sdk_version_or_codename *string `json:",omitempty"` + Platform_sdk_final *bool `json:",omitempty"` + Platform_sdk_extension_version *int `json:",omitempty"` + Platform_base_sdk_extension_version *int `json:",omitempty"` + Platform_version_active_codenames []string `json:",omitempty"` + Platform_version_all_preview_codenames []string `json:",omitempty"` + Platform_systemsdk_versions []string `json:",omitempty"` + Platform_security_patch *string `json:",omitempty"` + Platform_preview_sdk_version *string `json:",omitempty"` + Platform_base_os *string `json:",omitempty"` + Platform_version_last_stable *string `json:",omitempty"` + Platform_version_known_codenames *string `json:",omitempty"` DeviceName *string `json:",omitempty"` DeviceProduct *string `json:",omitempty"` |