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>
This commit is contained in:
commit
ee76dc3e21
2 changed files with 21 additions and 18 deletions
|
@ -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 {
|
||||
|
|
|
@ -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"`
|
||||
|
|
Loading…
Reference in a new issue