diff options
| author | 2023-03-03 21:20:36 +0000 | |
|---|---|---|
| committer | 2023-03-20 16:51:32 +0000 | |
| commit | e773739787394e9632043749e88ca6cfd5a40a67 (patch) | |
| tree | c069277b81df80f608af7f97b33e62c3e0d18ff8 /apex/apex.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 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/apex/apex.go b/apex/apex.go index b2ca6c480..9e9d74211 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -2946,12 +2946,8 @@ func (a *apexBundle) minSdkVersionValue(ctx android.EarlyModuleContext) string { } // Returns apex's min_sdk_version SdkSpec, honoring overrides -func (a *apexBundle) MinSdkVersion(ctx android.EarlyModuleContext) android.SdkSpec { - return android.SdkSpec{ - Kind: android.SdkNone, - ApiLevel: a.minSdkVersion(ctx), - Raw: a.minSdkVersionValue(ctx), - } +func (a *apexBundle) MinSdkVersion(ctx android.EarlyModuleContext) android.ApiLevel { + return a.minSdkVersion(ctx) } // Returns apex's min_sdk_version ApiLevel, honoring overrides |