StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Update soong to use flag for min supported sdk am: ba270c503a

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3037607

Change-Id: I647dc57aafe68ad0ff4b97e6c558737daabc5303
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Linus Tufvesson
2024-04-16 09:28:39 +00:00
committed by Automerger Merge Worker
parent 8151acc62d ba270c503a
commit 5c7b9120c5
2 changed files with 21 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
android/config.go
View File

@@ -949,7 +949,11 @@ func (c *config) PlatformPreviewSdkVersion() string {
} }
func (c *config) PlatformMinSupportedTargetSdkVersion() 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 { func (c *config) PlatformBaseOS() string {

33
android/variable.go
View File

@@ -201,23 +201,22 @@ type ProductVariables struct {
BuildThumbprintFile *string `json:",omitempty"` BuildThumbprintFile *string `json:",omitempty"`
DisplayBuildNumber *bool `json:",omitempty"` DisplayBuildNumber *bool `json:",omitempty"`
Platform_display_version_name *string `json:",omitempty"` Platform_display_version_name *string `json:",omitempty"`
Platform_version_name *string `json:",omitempty"` Platform_version_name *string `json:",omitempty"`
Platform_sdk_version *int `json:",omitempty"` Platform_sdk_version *int `json:",omitempty"`
Platform_sdk_codename *string `json:",omitempty"` Platform_sdk_codename *string `json:",omitempty"`
Platform_sdk_version_or_codename *string `json:",omitempty"` Platform_sdk_version_or_codename *string `json:",omitempty"`
Platform_sdk_final *bool `json:",omitempty"` Platform_sdk_final *bool `json:",omitempty"`
Platform_sdk_extension_version *int `json:",omitempty"` Platform_sdk_extension_version *int `json:",omitempty"`
Platform_base_sdk_extension_version *int `json:",omitempty"` Platform_base_sdk_extension_version *int `json:",omitempty"`
Platform_version_active_codenames []string `json:",omitempty"` Platform_version_active_codenames []string `json:",omitempty"`
Platform_version_all_preview_codenames []string `json:",omitempty"` Platform_version_all_preview_codenames []string `json:",omitempty"`
Platform_systemsdk_versions []string `json:",omitempty"` Platform_systemsdk_versions []string `json:",omitempty"`
Platform_security_patch *string `json:",omitempty"` Platform_security_patch *string `json:",omitempty"`
Platform_preview_sdk_version *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_base_os *string `json:",omitempty"` Platform_version_last_stable *string `json:",omitempty"`
Platform_version_last_stable *string `json:",omitempty"` Platform_version_known_codenames *string `json:",omitempty"`
Platform_version_known_codenames *string `json:",omitempty"`
DeviceName *string `json:",omitempty"` DeviceName *string `json:",omitempty"`
DeviceProduct *string `json:",omitempty"` DeviceProduct *string `json:",omitempty"`