StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Modify extractStubsSourceInfoFromDep to respect RELEASE_HIDDEN_API_EXPORTABLE_STUBS flag" into main

Browse Source
This commit is contained in:
Jihoon Kang
2024-06-25 23:00:00 +00:00
committed by Gerrit Code Review
parent 94a6824c99 2a26b1326b
commit 00d405099c
1 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
java/sdk_library.go
View File

@@ -819,22 +819,23 @@ func (paths *scopePaths) extractStubsSourceInfoFromApiStubsProviders(provider Ap
} }
func (paths *scopePaths) extractStubsSourceInfoFromDep(ctx android.ModuleContext, dep android.Module) error { 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.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 { func (paths *scopePaths) extractStubsSourceAndApiInfoFromApiStubsProvider(ctx android.ModuleContext, dep android.Module) error {
stubsType := Everything
if ctx.Config().ReleaseHiddenApiExportableStubs() { if ctx.Config().ReleaseHiddenApiExportableStubs() {
return paths.treatDepAsApiStubsProvider(dep, func(provider ApiStubsProvider) error { stubsType = Exportable
extractApiInfoErr := paths.extractApiInfoFromApiStubsProvider(provider, Exportable)
extractStubsSourceInfoErr := paths.extractStubsSourceInfoFromApiStubsProviders(provider, Exportable)
return errors.Join(extractApiInfoErr, extractStubsSourceInfoErr)
})
} }
return paths.treatDepAsApiStubsProvider(dep, func(provider ApiStubsProvider) error { return paths.treatDepAsApiStubsProvider(dep, func(provider ApiStubsProvider) error {
extractApiInfoErr := paths.extractApiInfoFromApiStubsProvider(provider, Everything) extractApiInfoErr := paths.extractApiInfoFromApiStubsProvider(provider, stubsType)
extractStubsSourceInfoErr := paths.extractStubsSourceInfoFromApiStubsProviders(provider, Everything) extractStubsSourceInfoErr := paths.extractStubsSourceInfoFromApiStubsProviders(provider, stubsType)
return errors.Join(extractApiInfoErr, extractStubsSourceInfoErr) return errors.Join(extractApiInfoErr, extractStubsSourceInfoErr)
}) })
} }