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

Replace ndk_libs.bzl with an attr in cc_stub_suite

Browse Source 
(This CL is a cleanup, and should be a no-op)

Currently we support three variations of cc api stubs.
1. publicapi stubs, i.e. ndk stubs (empty additional args to ndkstubgen)
2. module-libapi stubs that are also an ndk library (--systemapi --apex)
3. module-libapi stubs that are not an ndk library (--systemapi --apex
   --no-ndk)

ndk_libs.bzl was used to differentiate between (2) and (3). This creates
an additional layer of indirection - users will need to modify this
external .bzl file if they would like to add a library to an ndk.

Replace this with an explicit atttibute in cc_stub_suite macro for better UX.

Test: go test ./bp2build
Test: b test //build/bazel/rules/cc:cc_stub_library_tests (added in
sibling CL)
Bug: 299501496

Change-Id: Idd3579e8013bae7a1740534f90d2767df5bac1a5
This commit is contained in:
Spandan Das
2023-10-06 21:35:21 +00:00
parent 69cf8a3221
commit 17a27f0c14
5 changed files with 74 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

59
bp2build/cc_library_conversion_test.go
View File

@@ -5178,6 +5178,7 @@ ndk_library {
ExpectedBazelTargets: []string{
MakeBazelTarget("cc_stub_suite", "libfoo.ndk_stub_libs", AttrNameToString{
"api_surface": `"publicapi"`,
"included_in_ndk": `True`,
"soname": `"libfoo.so"`,
"source_library_label": `"//:libfoo"`,
"symbol_file": `"libfoo.map.txt"`,
@@ -5305,3 +5306,61 @@ cc_library_static {
},
})
}
func TestPropertiesIfStubLibraryIsInNdk(t *testing.T) {
tc := Bp2buildTestCase{
Description: "If an equivalent ndk_library exists, set included_in_ndk=true for module-libapi stubs",
ModuleTypeUnderTest: "cc_library",
ModuleTypeUnderTestFactory: cc.LibraryFactory,
Blueprint: `
// libfoo is an ndk library and contributes to module-libapi
cc_library {
name: "libfoo",
stubs: {symbol_file: "libfoo.map.txt"},
}
ndk_library {
name: "libfoo",
first_version: "29",
symbol_file: "libfoo.map.txt",
}
// libbar is not an ndk library, but contributes to module-libapi
cc_library {
name: "libbar",
stubs: {symbol_file: "libbar.map.txt"},
}
`,
StubbedBuildDefinitions: []string{"libfoo.ndk"},
ExpectedBazelTargets: []string{
MakeBazelTarget("cc_library_static", "libfoo_bp2build_cc_library_static", AttrNameToString{
"local_includes": `["."]`,
}),
MakeBazelTarget("cc_library_shared", "libfoo", AttrNameToString{
"local_includes": `["."]`,
"stubs_symbol_file": `"libfoo.map.txt"`,
}),
MakeBazelTarget("cc_stub_suite", "libfoo_stub_libs", AttrNameToString{
"api_surface": `"module-libapi"`,
"soname": `"libfoo.so"`,
"source_library_label": `"//:libfoo"`,
"symbol_file": `"libfoo.map.txt"`,
"versions": `["current"]`,
"included_in_ndk": `True`,
}),
MakeBazelTarget("cc_library_static", "libbar_bp2build_cc_library_static", AttrNameToString{
"local_includes": `["."]`,
}),
MakeBazelTarget("cc_library_shared", "libbar", AttrNameToString{
"local_includes": `["."]`,
"stubs_symbol_file": `"libbar.map.txt"`,
}),
MakeBazelTarget("cc_stub_suite", "libbar_stub_libs", AttrNameToString{
"api_surface": `"module-libapi"`,
"soname": `"libbar.so"`,
"source_library_label": `"//:libbar"`,
"symbol_file": `"libbar.map.txt"`,
"versions": `["current"]`,
}),
},
}
runCcLibraryTestCase(t, tc)
}