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

Test SdkSpecForm.

Browse Source 
Bug: 190818041
Test: presubmit
Change-Id: Ib8cd891f03537712d709ed063dd76dee55221118
Merged-In: Ib8cd891f03537712d709ed063dd76dee55221118
(cherry picked from commit 0ee2f913ef)
This commit is contained in:
satayev
2021-12-01 17:39:48 +00:00
parent f8f68e8ffa
commit fba70bc07f
4 changed files with 107 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
android/sdk_version.go
View File

@@ -117,7 +117,7 @@ func (s SdkSpec) Stable() bool {
return false
}
// PrebuiltSdkAvailableForUnbundledBuilt tells whether this SdkSpec can have a prebuilt SDK
// PrebuiltSdkAvailableForUnbundledBuild tells whether this SdkSpec can have a prebuilt SDK
// that can be used for unbundled builds.
func (s SdkSpec) PrebuiltSdkAvailableForUnbundledBuild() bool {
// "", "none", and "core_platform" are not available for unbundled build
@@ -212,6 +212,10 @@ var (
)
func SdkSpecFrom(ctx EarlyModuleContext, str string) SdkSpec {
return SdkSpecFromWithConfig(ctx.Config(), str)
}
func SdkSpecFromWithConfig(config Config, str string) SdkSpec {
switch str {
// special cases first
case "":
@@ -252,7 +256,7 @@ func SdkSpecFrom(ctx EarlyModuleContext, str string) SdkSpec {
return SdkSpec{SdkInvalid, NoneApiLevel, str}
}
apiLevel, err := ApiLevelFromUser(ctx, versionString)
apiLevel, err := ApiLevelFromUserWithConfig(config, versionString)
if err != nil {
return SdkSpec{SdkInvalid, apiLevel, str}
}