diff options
| author | 2024-06-25 23:00:00 +0000 | |
|---|---|---|
| committer | 2024-06-25 23:00:00 +0000 | |
| commit | 00d405099cd89c7beb68ea16cfde67c36aca254f (patch) | |
| tree | 9e7ee0cd0ed05fcf2e3aaafe47f2342c4667410c /java/sdk_library.go | |
| parent | 94a6824c99dc001532fa55203462cf4fecb9f9b2 (diff) | |
| parent | 2a26b1326b80d3d45c6f8ec1f143eb8fefa89154 (diff) | |
Merge "Modify extractStubsSourceInfoFromDep to respect RELEASE_HIDDEN_API_EXPORTABLE_STUBS flag" into main
Diffstat (limited to 'java/sdk_library.go')
| -rw-r--r-- | java/sdk_library.go | 17 |
1 files changed, 9 insertions, 8 deletions
diff --git a/java/sdk_library.go b/java/sdk_library.go index 82f6cb5a9..78ac76094 100644 --- a/java/sdk_library.go +++ b/java/sdk_library.go @@ -819,22 +819,23 @@ func (paths *scopePaths) extractStubsSourceInfoFromApiStubsProviders(provider Ap } func (paths *scopePaths) extractStubsSourceInfoFromDep(ctx android.ModuleContext, dep android.Module) error { + stubsType := Everything + if ctx.Config().ReleaseHiddenApiExportableStubs() { + stubsType = Exportable + } return paths.treatDepAsApiStubsSrcProvider(dep, func(provider ApiStubsSrcProvider) error { - return paths.extractStubsSourceInfoFromApiStubsProviders(provider, Everything) + return paths.extractStubsSourceInfoFromApiStubsProviders(provider, stubsType) }) } func (paths *scopePaths) extractStubsSourceAndApiInfoFromApiStubsProvider(ctx android.ModuleContext, dep android.Module) error { + stubsType := Everything if ctx.Config().ReleaseHiddenApiExportableStubs() { - return paths.treatDepAsApiStubsProvider(dep, func(provider ApiStubsProvider) error { - extractApiInfoErr := paths.extractApiInfoFromApiStubsProvider(provider, Exportable) - extractStubsSourceInfoErr := paths.extractStubsSourceInfoFromApiStubsProviders(provider, Exportable) - return errors.Join(extractApiInfoErr, extractStubsSourceInfoErr) - }) + stubsType = Exportable } return paths.treatDepAsApiStubsProvider(dep, func(provider ApiStubsProvider) error { - extractApiInfoErr := paths.extractApiInfoFromApiStubsProvider(provider, Everything) - extractStubsSourceInfoErr := paths.extractStubsSourceInfoFromApiStubsProviders(provider, Everything) + extractApiInfoErr := paths.extractApiInfoFromApiStubsProvider(provider, stubsType) + extractStubsSourceInfoErr := paths.extractStubsSourceInfoFromApiStubsProviders(provider, stubsType) return errors.Join(extractApiInfoErr, extractStubsSourceInfoErr) }) } |