diff options
Diffstat (limited to 'android/sdk_version.go')
| -rw-r--r-- | android/sdk_version.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/android/sdk_version.go b/android/sdk_version.go index 1fadda0ca..aafcee79a 100644 --- a/android/sdk_version.go +++ b/android/sdk_version.go @@ -48,6 +48,7 @@ const ( SdkPublic SdkSystem SdkTest + SdkTestFrameworksCore SdkModule SdkSystemServer SdkPrivate @@ -67,6 +68,8 @@ func (k SdkKind) String() string { return "system" case SdkTest: return "test" + case SdkTestFrameworksCore: + return "test_frameworks_core" case SdkCore: return "core" case SdkCorePlatform: @@ -92,6 +95,8 @@ func (k SdkKind) DefaultJavaLibraryName() string { return "android_system_stubs_current" case SdkTest: return "android_test_stubs_current" + case SdkTestFrameworksCore: + return "android_test_frameworks_core_stubs_current" case SdkCore: return "core.current.stubs" case SdkModule: @@ -137,7 +142,7 @@ func (s SdkSpec) Stable() bool { return true case SdkCore, SdkPublic, SdkSystem, SdkModule, SdkSystemServer: return true - case SdkCorePlatform, SdkTest, SdkPrivate: + case SdkCorePlatform, SdkTest, SdkTestFrameworksCore, SdkPrivate: return false default: panic(fmt.Errorf("unknown SdkKind=%v", s.Kind)) @@ -185,7 +190,8 @@ func (s SdkSpec) UsePrebuilt(ctx EarlyModuleContext) bool { return ctx.Config().AlwaysUsePrebuiltSdks() } else if !s.ApiLevel.IsPreview() { // validation check - if s.Kind != SdkPublic && s.Kind != SdkSystem && s.Kind != SdkTest && s.Kind != SdkModule && s.Kind != SdkSystemServer { + if s.Kind != SdkPublic && s.Kind != SdkSystem && s.Kind != SdkTest && + s.Kind != SdkTestFrameworksCore && s.Kind != SdkModule && s.Kind != SdkSystemServer { panic(fmt.Errorf("prebuilt SDK is not not available for SdkKind=%q", s.Kind)) return false } @@ -266,6 +272,8 @@ func SdkSpecFromWithConfig(config Config, str string) SdkSpec { kind = SdkSystem case "test": kind = SdkTest + case "test_frameworks_core": + kind = SdkTestFrameworksCore case "module": kind = SdkModule case "system_server": |