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

Merge "Parameterize cc_stub_suite for api surface" into main

Browse Source
This commit is contained in:
Spandan Das
2023-09-14 21:39:17 +00:00
committed by Gerrit Code Review
parent 4e86d7a342 04f9f4cf71
commit 0e76a723fc
5 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
bp2build/apex_conversion_test.go
View File

@@ -1315,6 +1315,7 @@ apex {
"tags": `["apex_available=myapex"]`, "tags": `["apex_available=myapex"]`,
}), }),
MakeBazelTarget("cc_stub_suite", "foo_stub_libs", AttrNameToString{ MakeBazelTarget("cc_stub_suite", "foo_stub_libs", AttrNameToString{
"api_surface": `"module-libapi"`,
"soname": `"foo.so"`, "soname": `"foo.so"`,
"source_library_label": `"//:foo"`, "source_library_label": `"//:foo"`,
"symbol_file": `"foo.map.txt"`, "symbol_file": `"foo.map.txt"`,

1
bp2build/cc_library_conversion_test.go
View File

@@ -2809,6 +2809,7 @@ func TestCcLibraryStubs(t *testing.T) {
"stubs_symbol_file": `"a.map.txt"`, "stubs_symbol_file": `"a.map.txt"`,
}) })
expectedBazelTargets = append(expectedBazelTargets, makeCcStubSuiteTargets("a", AttrNameToString{ expectedBazelTargets = append(expectedBazelTargets, makeCcStubSuiteTargets("a", AttrNameToString{
"api_surface": `"module-libapi"`,
"soname": `"a.so"`, "soname": `"a.so"`,
"source_library_label": `"//foo/bar:a"`, "source_library_label": `"//foo/bar:a"`,
"stubs_symbol_file": `"a.map.txt"`, "stubs_symbol_file": `"a.map.txt"`,

3
bp2build/cc_library_shared_conversion_test.go
View File

@@ -543,6 +543,7 @@ cc_library_shared {
}, },
Blueprint: soongCcLibraryPreamble, Blueprint: soongCcLibraryPreamble,
ExpectedBazelTargets: []string{makeCcStubSuiteTargets("a", AttrNameToString{ ExpectedBazelTargets: []string{makeCcStubSuiteTargets("a", AttrNameToString{
"api_surface": `"module-libapi"`,
"soname": `"a.so"`, "soname": `"a.so"`,
"source_library_label": `"//foo/bar:a"`, "source_library_label": `"//foo/bar:a"`,
"stubs_symbol_file": `"a.map.txt"`, "stubs_symbol_file": `"a.map.txt"`,
@@ -1442,6 +1443,7 @@ cc_library_shared {
`, `,
ExpectedBazelTargets: []string{ ExpectedBazelTargets: []string{
makeCcStubSuiteTargets("a", AttrNameToString{ makeCcStubSuiteTargets("a", AttrNameToString{
"api_surface": `"module-libapi"`,
"soname": `"a.so"`, "soname": `"a.so"`,
"source_library_label": `"//:a"`, "source_library_label": `"//:a"`,
"stubs_symbol_file": `"a.map.txt"`, "stubs_symbol_file": `"a.map.txt"`,
@@ -1456,6 +1458,7 @@ cc_library_shared {
"stubs_symbol_file": `"a.map.txt"`, "stubs_symbol_file": `"a.map.txt"`,
}), }),
makeCcStubSuiteTargets("b", AttrNameToString{ makeCcStubSuiteTargets("b", AttrNameToString{
"api_surface": `"module-libapi"`,
"soname": `"b.so"`, "soname": `"b.so"`,
"source_library_label": `"//:b"`, "source_library_label": `"//:b"`,
"stubs_symbol_file": `"b.map.txt"`, "stubs_symbol_file": `"b.map.txt"`,

1
bp2build/testing.go
View File

@@ -644,6 +644,7 @@ func makeCcStubSuiteTargets(name string, attrs AttrNameToString) string {
return "" return ""
} }
STUB_SUITE_ATTRS := map[string]string{ STUB_SUITE_ATTRS := map[string]string{
"api_surface": "api_surface",
"stubs_symbol_file": "symbol_file", "stubs_symbol_file": "symbol_file",
"stubs_versions": "versions", "stubs_versions": "versions",
"soname": "soname", "soname": "soname",

2
cc/library.go
View File

@@ -494,6 +494,7 @@ func createStubsBazelTargetIfNeeded(ctx android.TopDownMutatorContext, m *Module
Soname: &soname, Soname: &soname,
Source_library_label: proptools.StringPtr(m.GetBazelLabel(ctx, m)), Source_library_label: proptools.StringPtr(m.GetBazelLabel(ctx, m)),
Deps: baseAttributes.deps, Deps: baseAttributes.deps,
Api_surface: proptools.StringPtr("module-libapi"),
} }
ctx.CreateBazelTargetModule(stubSuitesProps, ctx.CreateBazelTargetModule(stubSuitesProps,
android.CommonAttributes{Name: m.Name() + "_stub_libs"}, android.CommonAttributes{Name: m.Name() + "_stub_libs"},
@@ -3121,6 +3122,7 @@ type bazelCcStubSuiteAttributes struct {
Source_library_label *string Source_library_label *string
Soname *string Soname *string
Deps bazel.LabelListAttribute Deps bazel.LabelListAttribute
Api_surface *string
} }
type bazelCcHeaderAbiCheckerAttributes struct { type bazelCcHeaderAbiCheckerAttributes struct {