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

Merge "Update max_sdk_version from SdkSpec to ApiLevel" am: 5aade5f52d

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

Change-Id: I35f44c5dc30e9c17b1c3c5fe5c6c36023775eb02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Spandan Das
2023-03-28 19:42:15 +00:00
committed by Automerger Merge Worker
parent bc413cd77c 5aade5f52d
commit 8620bbd365
7 changed files with 28 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
android/sdk_version.go
View File

@@ -28,9 +28,9 @@ type SdkContext interface {
// MinSdkVersion returns ApiLevel that corresponds to the min_sdk_version property of the current module, // MinSdkVersion returns ApiLevel that corresponds to the min_sdk_version property of the current module,
// or from sdk_version if it is not set. // or from sdk_version if it is not set.
MinSdkVersion(ctx EarlyModuleContext) ApiLevel MinSdkVersion(ctx EarlyModuleContext) ApiLevel
// ReplaceMaxSdkVersionPlaceholder returns SdkSpec to replace the maxSdkVersion property of permission and // ReplaceMaxSdkVersionPlaceholder returns Apilevel to replace the maxSdkVersion property of permission and
// uses-permission tags if it is set. // uses-permission tags if it is set.
ReplaceMaxSdkVersionPlaceholder(ctx EarlyModuleContext) SdkSpec ReplaceMaxSdkVersionPlaceholder(ctx EarlyModuleContext) ApiLevel
// TargetSdkVersion returns the ApiLevel that corresponds to the target_sdk_version property of the current module, // TargetSdkVersion returns the ApiLevel that corresponds to the target_sdk_version property of the current module,
// or from sdk_version if it is not set. // or from sdk_version if it is not set.
TargetSdkVersion(ctx EarlyModuleContext) ApiLevel TargetSdkVersion(ctx EarlyModuleContext) ApiLevel

4
java/aar.go
View File

@@ -721,8 +721,8 @@ func (a *AARImport) MinSdkVersion(ctx android.EarlyModuleContext) android.ApiLev
return a.SdkVersion(ctx).ApiLevel return a.SdkVersion(ctx).ApiLevel
} }
func (a *AARImport) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.SdkSpec { func (a *AARImport) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.ApiLevel {
return android.SdkSpecFrom(ctx, "") return android.SdkSpecFrom(ctx, "").ApiLevel
} }
func (a *AARImport) TargetSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel { func (a *AARImport) TargetSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel {

22
java/base.go
View File

@@ -490,7 +490,7 @@ type Module struct {
sdkVersion android.SdkSpec sdkVersion android.SdkSpec
minSdkVersion android.ApiLevel minSdkVersion android.ApiLevel
maxSdkVersion android.SdkSpec maxSdkVersion android.ApiLevel
sourceExtensions []string sourceExtensions []string
} }
@@ -672,16 +672,20 @@ func (j *Module) MinSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel
return j.SdkVersion(ctx).ApiLevel return j.SdkVersion(ctx).ApiLevel
} }
func (j *Module) MaxSdkVersion(ctx android.EarlyModuleContext) android.SdkSpec { func (j *Module) MaxSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel {
maxSdkVersion := proptools.StringDefault(j.deviceProperties.Max_sdk_version, "") if j.deviceProperties.Max_sdk_version != nil {
// SdkSpecFrom returns SdkSpecPrivate for this, which may be confusing. return android.ApiLevelFrom(ctx, *j.deviceProperties.Max_sdk_version)
// TODO(b/208456999): ideally MaxSdkVersion should be an ApiLevel and not SdkSpec. }
return android.SdkSpecFrom(ctx, maxSdkVersion) // Default is PrivateApiLevel
return android.SdkSpecPrivate.ApiLevel
} }
func (j *Module) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.SdkSpec { func (j *Module) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.ApiLevel {
replaceMaxSdkVersionPlaceholder := proptools.StringDefault(j.deviceProperties.Replace_max_sdk_version_placeholder, "") if j.deviceProperties.Replace_max_sdk_version_placeholder != nil {
return android.SdkSpecFrom(ctx, replaceMaxSdkVersionPlaceholder) return android.ApiLevelFrom(ctx, *j.deviceProperties.Replace_max_sdk_version_placeholder)
}
// Default is PrivateApiLevel
return android.SdkSpecPrivate.ApiLevel
} }
func (j *Module) MinSdkVersionString() string { func (j *Module) MinSdkVersionString() string {

6
java/classpath_fragment.go
View File

@@ -136,11 +136,11 @@ func configuredJarListToClasspathJars(ctx android.ModuleContext, configuredJars
jar.minSdkVersion = s.minSdkVersion.String() jar.minSdkVersion = s.minSdkVersion.String()
} }
} }
if s.maxSdkVersion.ApiLevel.Specified() { if s.maxSdkVersion.Specified() {
if s.maxSdkVersion.ApiLevel.IsCurrent() { if s.maxSdkVersion.IsCurrent() {
jar.maxSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String() jar.maxSdkVersion = ctx.Config().DefaultAppTargetSdk(ctx).String()
} else { } else {
jar.maxSdkVersion = s.maxSdkVersion.ApiLevel.String() jar.maxSdkVersion = s.maxSdkVersion.String()
} }
} }
} }

4
java/droiddoc.go
View File

@@ -252,8 +252,8 @@ func (j *Javadoc) MinSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel
return j.SdkVersion(ctx).ApiLevel return j.SdkVersion(ctx).ApiLevel
} }
func (j *Javadoc) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.SdkSpec { func (j *Javadoc) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.ApiLevel {
return j.SdkVersion(ctx) return j.SdkVersion(ctx).ApiLevel
} }
func (j *Javadoc) TargetSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel { func (j *Javadoc) TargetSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel {

7
java/java.go
View File

@@ -1898,11 +1898,12 @@ func (j *Import) MinSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel
return j.SdkVersion(ctx).ApiLevel return j.SdkVersion(ctx).ApiLevel
} }
func (j *Import) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.SdkSpec { func (j *Import) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.ApiLevel {
if j.properties.Replace_max_sdk_version_placeholder != nil { if j.properties.Replace_max_sdk_version_placeholder != nil {
return android.SdkSpecFrom(ctx, *j.properties.Replace_max_sdk_version_placeholder) return android.ApiLevelFrom(ctx, *j.properties.Replace_max_sdk_version_placeholder)
} }
return android.SdkSpecFrom(ctx, "") // Default is PrivateApiLevel
return android.SdkSpecPrivate.ApiLevel
} }
func (j *Import) TargetSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel { func (j *Import) TargetSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel {

4
java/rro.go
View File

@@ -182,8 +182,8 @@ func (r *RuntimeResourceOverlay) MinSdkVersion(ctx android.EarlyModuleContext) a
return r.SdkVersion(ctx).ApiLevel return r.SdkVersion(ctx).ApiLevel
} }
func (r *RuntimeResourceOverlay) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.SdkSpec { func (r *RuntimeResourceOverlay) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.ApiLevel {
return android.SdkSpecFrom(ctx, "") return android.SdkSpecPrivate.ApiLevel
} }
func (r *RuntimeResourceOverlay) TargetSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel { func (r *RuntimeResourceOverlay) TargetSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel {