diff options
| -rw-r--r-- | java/bootclasspath.go | 8 | ||||
| -rw-r--r-- | java/bootclasspath_fragment.go | 6 |
2 files changed, 7 insertions, 7 deletions
diff --git a/java/bootclasspath.go b/java/bootclasspath.go index 77ddf5c05..029f6f623 100644 --- a/java/bootclasspath.go +++ b/java/bootclasspath.go @@ -196,7 +196,7 @@ var platformBootclasspathDepTag = bootclasspathDependencyTag{name: "platform"} type BootclasspathNestedAPIProperties struct { // java_library or preferably, java_sdk_library modules providing stub classes that define the // APIs provided by this bootclasspath_fragment. - Stub_libs []string + Stub_libs proptools.Configurable[[]string] } // BootclasspathAPIProperties defines properties for defining the API provided by parts of the @@ -229,11 +229,11 @@ type BootclasspathAPIProperties struct { // apiScopeToStubLibs calculates the stub library modules for each relevant *HiddenAPIScope from the // Stub_libs properties. -func (p BootclasspathAPIProperties) apiScopeToStubLibs() map[*HiddenAPIScope][]string { +func (p BootclasspathAPIProperties) apiScopeToStubLibs(ctx android.BaseModuleContext) map[*HiddenAPIScope][]string { m := map[*HiddenAPIScope][]string{} for _, apiScope := range hiddenAPISdkLibrarySupportedScopes { - m[apiScope] = p.Api.Stub_libs + m[apiScope] = p.Api.Stub_libs.GetOrDefault(ctx, nil) } - m[CorePlatformHiddenAPIScope] = p.Core_platform_api.Stub_libs + m[CorePlatformHiddenAPIScope] = p.Core_platform_api.Stub_libs.GetOrDefault(ctx, nil) return m } diff --git a/java/bootclasspath_fragment.go b/java/bootclasspath_fragment.go index 16209b72e..bce507a7d 100644 --- a/java/bootclasspath_fragment.go +++ b/java/bootclasspath_fragment.go @@ -445,7 +445,7 @@ func (b *BootclasspathFragmentModule) ComponentDepsMutator(ctx android.BottomUpM func (b *BootclasspathFragmentModule) DepsMutator(ctx android.BottomUpMutatorContext) { // Add dependencies onto all the modules that provide the API stubs for classes on this // bootclasspath fragment. - hiddenAPIAddStubLibDependencies(ctx, b.properties.apiScopeToStubLibs()) + hiddenAPIAddStubLibDependencies(ctx, b.properties.apiScopeToStubLibs(ctx)) for _, additionalStubModule := range b.properties.Additional_stubs { for _, apiScope := range hiddenAPISdkLibrarySupportedScopes { @@ -933,8 +933,8 @@ func (b *bootclasspathFragmentSdkMemberProperties) PopulateFromVariant(ctx andro b.Filtered_flags_path = android.OptionalPathForPath(hiddenAPIInfo.FilteredFlagsPath) // Copy stub_libs properties. - b.Stub_libs = module.properties.Api.Stub_libs - b.Core_platform_stub_libs = module.properties.Core_platform_api.Stub_libs + b.Stub_libs = module.properties.Api.Stub_libs.GetOrDefault(mctx, nil) + b.Core_platform_stub_libs = module.properties.Core_platform_api.Stub_libs.GetOrDefault(mctx, nil) // Copy fragment properties. b.Fragments = module.properties.Fragments |