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 am: 00d405099c

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/build/soong/+/3141091

Change-Id: I9da1bb19bd4735d5542f90257ab4b6070431b226
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Jihoon Kang
2024-06-25 23:20:29 +00:00
committed by Automerger Merge Worker
parent 7c90072c34 00d405099c
commit e19a7ae1d1
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 {
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)
})
}