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

Convert additional sdk_library stub libraries to from stub generation

Browse Source 
legacy.i18n.module.platform.api, stable.i18n.module.platform.api and
conscrypt.module.platform.api contributes to api surfaces, but the
corresponding stub libraries were being generated from source during
from-text stub build. This discrepancy may lead to hiddenapi failure.
Thus, enable these modules to be built from txt files during from-text
stub build.

Test: m
Bug: 274805756
Change-Id: I940dc8484b210bb8aea57ead1055983be7cdf5ec
This commit is contained in:
Jihoon Kang
2023-08-02 06:44:57 +00:00
parent 95e8fe9e1e
commit 0c705a448f
1 changed files with 56 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
java/sdk_library.go
View File

@@ -387,6 +387,23 @@ var (
apiScopeModuleLib,
apiScopeSystemServer,
}
apiLibraryAdditionalProperties = map[string]struct {
FullApiSurfaceStubLib string
AdditionalApiContribution string
}{
"legacy.i18n.module.platform.api": {
FullApiSurfaceStubLib: "legacy.core.platform.api.stubs",
AdditionalApiContribution: "i18n.module.public.api.stubs.source.api.contribution",
},
"stable.i18n.module.platform.api": {
FullApiSurfaceStubLib: "stable.core.platform.api.stubs",
AdditionalApiContribution: "i18n.module.public.api.stubs.source.api.contribution",
},
"conscrypt.module.platform.api": {
FullApiSurfaceStubLib: "stable.core.platform.api.stubs",
AdditionalApiContribution: "conscrypt.module.public.api.stubs.source.api.contribution",
},
}
)
var (
@@ -1513,6 +1530,29 @@ func (module *SdkLibrary) contributesToApiSurface(c android.Config) bool {
return exists
}
// The listed modules are the special java_sdk_libraries where apiScope.kind do not match the
// api surface that the module contribute to. For example, the public droidstubs and java_library
// do not contribute to the public api surface, but contributes to the core platform api surface.
// This method returns the full api surface stub lib that
// the generated java_api_library should depend on.
func (module *SdkLibrary) alternativeFullApiSurfaceStubLib() string {
if val, ok := apiLibraryAdditionalProperties[module.Name()]; ok {
return val.FullApiSurfaceStubLib
}
return ""
}
// The listed modules' stubs contents do not match the corresponding txt files,
// but require additional api contributions to generate the full stubs.
// This method returns the name of the additional api contribution module
// for corresponding sdk_library modules.
func (module *SdkLibrary) apiLibraryAdditionalApiContribution() string {
if val, ok := apiLibraryAdditionalProperties[module.Name()]; ok {
return val.AdditionalApiContribution
}
return ""
}
func childModuleVisibility(childVisibility []string) []string {
if childVisibility == nil {
// No child visibility set. The child will use the visibility of the sdk_library.
@@ -1778,7 +1818,7 @@ func (module *SdkLibrary) createStubsSourcesAndApi(mctx android.DefaultableHookC
mctx.CreateModule(DroidstubsFactory, &props).(*Droidstubs).CallHookIfAvailable(mctx)
}
func (module *SdkLibrary) createApiLibrary(mctx android.DefaultableHookContext, apiScope *apiScope) {
func (module *SdkLibrary) createApiLibrary(mctx android.DefaultableHookContext, apiScope *apiScope, alternativeFullApiSurfaceStub string) {
props := struct {
Name *string
Visibility []string
@@ -1801,6 +1841,12 @@ func (module *SdkLibrary) createApiLibrary(mctx android.DefaultableHookContext,
apiContributions = append(apiContributions, module.stubsSourceModuleName(scope)+".api.contribution")
scope = scope.extends
}
if apiScope == apiScopePublic {
additionalApiContribution := module.apiLibraryAdditionalApiContribution()
if additionalApiContribution != "" {
apiContributions = append(apiContributions, additionalApiContribution)
}
}
props.Api_contributions = apiContributions
props.Libs = module.properties.Libs
@@ -1808,6 +1854,9 @@ func (module *SdkLibrary) createApiLibrary(mctx android.DefaultableHookContext,
props.Libs = append(props.Libs, "stub-annotations")
props.Static_libs = module.sdkLibraryProperties.Stub_only_static_libs
props.Full_api_surface_stub = proptools.StringPtr(apiScope.kind.DefaultJavaLibraryName() + ".from-text")
if alternativeFullApiSurfaceStub != "" {
props.Full_api_surface_stub = proptools.StringPtr(alternativeFullApiSurfaceStub)
}
// android_module_lib_stubs_current.from-text only comprises api contributions from art, conscrypt and i18n.
// Thus, replace with android_module_lib_stubs_current_full.from-text, which comprises every api domains.
@@ -2062,9 +2111,13 @@ func (module *SdkLibrary) CreateInternalModules(mctx android.DefaultableHookCont
module.createStubsLibrary(mctx, scope)
contributesToApiSurface := module.contributesToApiSurface(mctx.Config())
alternativeFullApiSurfaceStubLib := ""
if scope == apiScopePublic {
alternativeFullApiSurfaceStubLib = module.alternativeFullApiSurfaceStubLib()
}
contributesToApiSurface := module.contributesToApiSurface(mctx.Config()) || alternativeFullApiSurfaceStubLib != ""
if contributesToApiSurface {
module.createApiLibrary(mctx, scope)
module.createApiLibrary(mctx, scope, alternativeFullApiSurfaceStubLib)
}
module.createTopLevelStubsLibrary(mctx, scope, contributesToApiSurface)