diff --git a/java/bootclasspath_fragment_test.go b/java/bootclasspath_fragment_test.go index aa1c59f41..78e37df87 100644 --- a/java/bootclasspath_fragment_test.go +++ b/java/bootclasspath_fragment_test.go @@ -258,4 +258,8 @@ func TestBootclasspathFragment_StubLibs(t *testing.T) { // Check that SdkCorePlatform uses public stubs from the mycoreplatform library. corePlatformStubsJar := "out/soong/.intermediates/mycoreplatform.stubs/android_common/dex/mycoreplatform.stubs.jar" android.AssertPathsRelativeToTopEquals(t, "core platform dex stubs jar", []string{corePlatformStubsJar}, info.TransitiveStubDexJarsByScope[CorePlatformHiddenAPIScope]) + + // Check the widest stubs. This should list the widest stub dex jar provided by each module. + // TODO(b/179354495): Fix this. + android.AssertPathsRelativeToTopEquals(t, "widest dex stubs jar", []string{corePlatformStubsJar}, info.TransitiveStubDexJarsByScope.StubDexJarsForWidestAPIScope()) } diff --git a/java/hiddenapi_modular.go b/java/hiddenapi_modular.go index 70bfdfb3f..6413e9c41 100644 --- a/java/hiddenapi_modular.go +++ b/java/hiddenapi_modular.go @@ -305,10 +305,10 @@ func buildRuleToGenerateHiddenAPIStubFlagsFile(ctx android.BuilderContext, name, tempPath := tempPathForRestat(ctx, outputPath) // Find the widest API stubs provided by the fragments on which this depends, if any. - dependencyStubDexJars := input.DependencyStubDexJarsByScope.stubDexJarsForWidestAPIScope() + dependencyStubDexJars := input.DependencyStubDexJarsByScope.StubDexJarsForWidestAPIScope() // Add widest API stubs from the additional dependencies of this, if any. - dependencyStubDexJars = append(dependencyStubDexJars, input.AdditionalStubDexJarsByScope.stubDexJarsForWidestAPIScope()...) + dependencyStubDexJars = append(dependencyStubDexJars, input.AdditionalStubDexJarsByScope.StubDexJarsForWidestAPIScope()...) command := rule.Command(). Tool(ctx.Config().HostToolPath(ctx, "hiddenapi")). @@ -579,9 +579,9 @@ func (s StubDexJarsByScope) dedupAndSort() { } } -// stubDexJarsForWidestAPIScope returns the stub dex jars for the widest API scope provided by this +// StubDexJarsForWidestAPIScope returns the stub dex jars for the widest API scope provided by this // map. The relative width of APIs is determined by their order in hiddenAPIScopes. -func (s StubDexJarsByScope) stubDexJarsForWidestAPIScope() android.Paths { +func (s StubDexJarsByScope) StubDexJarsForWidestAPIScope() android.Paths { for i := len(hiddenAPIScopes) - 1; i >= 0; i-- { apiScope := hiddenAPIScopes[i] stubsForAPIScope := s[apiScope]