From e773739787394e9632043749e88ca6cfd5a40a67 Mon Sep 17 00:00:00 2001 From: Spandan Das Date: Fri, 3 Mar 2023 21:20:36 +0000 Subject: 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 --- android/sdk.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'android/sdk.go') diff --git a/android/sdk.go b/android/sdk.go index 8b23d63a9..63e0bbeec 100644 --- a/android/sdk.go +++ b/android/sdk.go @@ -25,7 +25,7 @@ import ( // minApiLevelForSdkSnapshot provides access to the min_sdk_version for MinApiLevelForSdkSnapshot type minApiLevelForSdkSnapshot interface { - MinSdkVersion(ctx EarlyModuleContext) SdkSpec + MinSdkVersion(ctx EarlyModuleContext) ApiLevel } // MinApiLevelForSdkSnapshot returns the ApiLevel of the min_sdk_version of the supplied module. @@ -34,7 +34,7 @@ type minApiLevelForSdkSnapshot interface { func MinApiLevelForSdkSnapshot(ctx EarlyModuleContext, module Module) ApiLevel { minApiLevel := NoneApiLevel if m, ok := module.(minApiLevelForSdkSnapshot); ok { - minApiLevel = m.MinSdkVersion(ctx).ApiLevel + minApiLevel = m.MinSdkVersion(ctx) } if minApiLevel == NoneApiLevel { // The default min API level is 1. -- cgit v1.2.3-59-g8ed1b