diff options
Diffstat (limited to 'java/bootclasspath.go')
| -rw-r--r-- | java/bootclasspath.go | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/java/bootclasspath.go b/java/bootclasspath.go index eddcc838b..4108770cd 100644 --- a/java/bootclasspath.go +++ b/java/bootclasspath.go @@ -144,6 +144,8 @@ func gatherApexModulePairDepsWithTag(ctx android.BaseModuleContext, tag blueprin // ApexVariantReference specifies a particular apex variant of a module. type ApexVariantReference struct { + android.BpPrintableBase + // The name of the module apex variant, i.e. the apex containing the module variant. // // If this is not specified then it defaults to "platform" which will cause a dependency to be @@ -225,13 +227,13 @@ type BootclasspathAPIProperties struct { Core_platform_api BootclasspathNestedAPIProperties } -// sdkKindToStubLibs calculates the stub library modules for each relevant android.SdkKind from the +// apiScopeToStubLibs calculates the stub library modules for each relevant *HiddenAPIScope from the // Stub_libs properties. -func (p BootclasspathAPIProperties) sdkKindToStubLibs() map[android.SdkKind][]string { - m := map[android.SdkKind][]string{} - for _, kind := range []android.SdkKind{android.SdkPublic, android.SdkSystem, android.SdkTest} { - m[kind] = p.Api.Stub_libs +func (p BootclasspathAPIProperties) apiScopeToStubLibs() map[*HiddenAPIScope][]string { + m := map[*HiddenAPIScope][]string{} + for _, apiScope := range hiddenAPISdkLibrarySupportedScopes { + m[apiScope] = p.Api.Stub_libs } - m[android.SdkCorePlatform] = p.Core_platform_api.Stub_libs + m[CorePlatformHiddenAPIScope] = p.Core_platform_api.Stub_libs return m } |