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

export SetStubsForDynamicDeps for use in AIDL

Browse Source 
Bug: 298249725
Change-Id: Ia93b320783eccf04fef167a26e2efb401c0e4236
This commit is contained in:
Sam Delmerico
2023-08-31 00:50:55 +00:00
parent edbf854aa5
commit dd6caa739d
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
cc/bp2build.go
View File

@@ -1380,10 +1380,10 @@ func (la *linkerAttributes) bp2buildForAxisAndConfig(ctx android.BazelConversion
// having stubs or not, so Bazel select() statement can be used to choose // having stubs or not, so Bazel select() statement can be used to choose
// source/stub variants of them. // source/stub variants of them.
apexAvailable := module.ApexAvailable() apexAvailable := module.ApexAvailable()
setStubsForDynamicDeps(ctx, axis, config, apexAvailable, sharedDeps.export, &la.dynamicDeps, 0, false) SetStubsForDynamicDeps(ctx, axis, config, apexAvailable, sharedDeps.export, &la.dynamicDeps, 0, false)
setStubsForDynamicDeps(ctx, axis, config, apexAvailable, sharedDeps.implementation, &la.implementationDynamicDeps, 1, false) SetStubsForDynamicDeps(ctx, axis, config, apexAvailable, sharedDeps.implementation, &la.implementationDynamicDeps, 1, false)
if len(systemSharedLibs) > 0 { if len(systemSharedLibs) > 0 {
setStubsForDynamicDeps(ctx, axis, config, apexAvailable, bazelLabelForSharedDeps(ctx, systemSharedLibs), &la.systemDynamicDeps, 2, true) SetStubsForDynamicDeps(ctx, axis, config, apexAvailable, bazelLabelForSharedDeps(ctx, systemSharedLibs), &la.systemDynamicDeps, 2, true)
} }
} }
@@ -1583,7 +1583,7 @@ func useStubOrImplInApexWithName(ssi stubSelectionInfo) {
} }
} }
func setStubsForDynamicDeps(ctx android.BazelConversionPathContext, axis bazel.ConfigurationAxis, func SetStubsForDynamicDeps(ctx android.BazelConversionPathContext, axis bazel.ConfigurationAxis,
config string, apexAvailable []string, dynamicLibs bazel.LabelList, dynamicDeps *bazel.LabelListAttribute, ind int, buildNonApexWithStubs bool) { config string, apexAvailable []string, dynamicLibs bazel.LabelList, dynamicDeps *bazel.LabelListAttribute, ind int, buildNonApexWithStubs bool) {
// Create a config_setting for each apex_available. // Create a config_setting for each apex_available.