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

Merge changes Ifbe123d1,Ie2e738a6 into main

Browse Source 
* changes:
  Support min_sdk_version overrides in apexes
  Support min_sdk_version overrides in apps
This commit is contained in:
Treehugger Robot
2024-05-20 17:38:11 +00:00
committed by Gerrit Code Review
parent 9b9d29b845 50801e20a3
commit 8298134503
9 changed files with 164 additions and 93 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
java/app.go
View File

@@ -338,23 +338,12 @@ func (a *AndroidApp) GenerateAndroidBuildActions(ctx android.ModuleContext) {
a.generateJavaUsedByApex(ctx)
}
func (a *AndroidApp) MinSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel {
defaultMinSdkVersion := a.Module.MinSdkVersion(ctx)
if proptools.Bool(a.appProperties.Updatable) {
overrideApiLevel := android.MinSdkVersionFromValue(ctx, ctx.DeviceConfig().ApexGlobalMinSdkVersionOverride())
if !overrideApiLevel.IsNone() && overrideApiLevel.CompareTo(defaultMinSdkVersion) > 0 {
return overrideApiLevel
}
}
return defaultMinSdkVersion
}
func (a *AndroidApp) checkAppSdkVersions(ctx android.ModuleContext) {
if a.Updatable() {
if !a.SdkVersion(ctx).Stable() {
ctx.PropertyErrorf("sdk_version", "Updatable apps must use stable SDKs, found %v", a.SdkVersion(ctx))
}
if String(a.deviceProperties.Min_sdk_version) == "" {
if String(a.overridableProperties.Min_sdk_version) == "" {
ctx.PropertyErrorf("updatable", "updatable apps must set min_sdk_version.")
}