tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Only generate stubs for shared libraries

Browse source 
Bug: 246958825
Test: Unit tests
Test: m nothing
Change-Id: If976027314b079525397fa8f5d6dc3de9f1221c8
This commit is contained in:
Trevor Radcliffe 2022-09-20 23:04:39 +00:00
parent 9f6e6238ef
commit f19d8a7f0a
2 changed files with 10 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
bp2build/cc_library_shared_conversion_test.go
View file

@ -488,22 +488,21 @@ cc_library_shared {
`,
},
Blueprint: soongCcLibraryPreamble,
ExpectedBazelTargets: []string{MakeBazelTarget("cc_library_shared", "a", AttrNameToString{
"has_stubs": `True`,
}),
makeCcStubSuiteTargets("a", AttrNameToString{
"soname": `"a.so"`,
"source_library": `":a"`,
"stubs_symbol_file": `"a.map.txt"`,
"stubs_versions": `[
ExpectedBazelTargets: []string{makeCcStubSuiteTargets("a", AttrNameToString{
"soname": `"a.so"`,
"source_library": `":a"`,
"stubs_symbol_file": `"a.map.txt"`,
"stubs_versions": `[
"28",
"29",
"current",
]`,
}),
MakeBazelTarget("cc_library_shared", "a", AttrNameToString{
"has_stubs": `True`,
}),
},
},
)
})
}
func TestCcLibrarySharedSystemSharedLibsSharedEmpty(t *testing.T) {

3
cc/library.go
View file

@ -2704,6 +2704,7 @@ func sharedOrStaticLibraryBp2Build(ctx android.TopDownMutatorContext, module *Mo
modType = "cc_library_static"
} else {
modType = "cc_library_shared"
createStubsBazelTargetIfNeeded(ctx, module, compilerAttrs, exportedIncludes, baseAttributes)
}
props := bazel.BazelTargetModuleProperties{
Rule_class: modType,
@ -2711,8 +2712,6 @@ func sharedOrStaticLibraryBp2Build(ctx android.TopDownMutatorContext, module *Mo
}
ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: module.Name()}, attrs)
createStubsBazelTargetIfNeeded(ctx, module, compilerAttrs, exportedIncludes, baseAttributes)
}
// TODO(b/199902614): Can this be factored to share with the other Attributes?