diff options
| author | 2023-03-03 21:20:36 +0000 | |
|---|---|---|
| committer | 2023-03-20 16:51:32 +0000 | |
| commit | e773739787394e9632043749e88ca6cfd5a40a67 (patch) | |
| tree | c069277b81df80f608af7f97b33e62c3e0d18ff8 /java/aar.go | |
| parent | 3015e38a5f0d466dd850fd0a77648844a1364efc (diff) | |
Update min_sdk_version from SdkSpec to ApiLevel
min_sdk_version signifies device version and does not need an sdkKind to
describe it fully. Update the type and cleanup existing usages. As a
side benefit, we also get better error handling since users can no
longer enter something like `public_30` as a valid min_sdk_version in bp
files
Will do a similar cleanup for targetSdkVersion and maxSdkVersion in a
followup CL
Test: m nothing
Test: no change in ninja files (this should be a no-op)
Bug: 208456999
Change-Id: Ie6ae7e267d093c5e4787e82685daaca1021d202e
Diffstat (limited to 'java/aar.go')
| -rw-r--r-- | java/aar.go | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/java/aar.go b/java/aar.go index 4bc5465aa..4e5ac1f36 100644 --- a/java/aar.go +++ b/java/aar.go @@ -220,12 +220,12 @@ func (a *aapt) aapt2Flags(ctx android.ModuleContext, sdkContext android.SdkConte linkDeps = append(linkDeps, assetDeps...) // Returns the effective version for {min|target}_sdk_version - effectiveVersionString := func(sdkVersion android.SdkSpec, minSdkVersion android.SdkSpec) string { + effectiveVersionString := func(sdkVersion android.SdkSpec, minSdkVersion android.ApiLevel) string { // If {min|target}_sdk_version is current, use sdk_version to determine the effective level // This is necessary for vendor modules. // The effective version does not _only_ depend on {min|target}_sdk_version(level), // but also on the sdk_version (kind+level) - if minSdkVersion.ApiLevel.IsCurrent() { + if minSdkVersion.IsCurrent() { ret, err := sdkVersion.EffectiveVersionString(ctx) if err != nil { ctx.ModuleErrorf("invalid sdk_version: %s", err) @@ -689,7 +689,7 @@ type AARImport struct { jniPackages android.Paths sdkVersion android.SdkSpec - minSdkVersion android.SdkSpec + minSdkVersion android.ApiLevel } var _ android.OutputFileProducer = (*AARImport)(nil) @@ -714,11 +714,11 @@ func (a *AARImport) SystemModules() string { return "" } -func (a *AARImport) MinSdkVersion(ctx android.EarlyModuleContext) android.SdkSpec { +func (a *AARImport) MinSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel { if a.properties.Min_sdk_version != nil { - return android.SdkSpecFrom(ctx, *a.properties.Min_sdk_version) + return android.ApiLevelFrom(ctx, *a.properties.Min_sdk_version) } - return a.SdkVersion(ctx) + return a.SdkVersion(ctx).ApiLevel } func (a *AARImport) ReplaceMaxSdkVersionPlaceholder(ctx android.EarlyModuleContext) android.SdkSpec { |