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

Merge "remove stub dependency on source_library"

Browse Source
This commit is contained in:
Sam Delmerico
2023-03-16 17:43:11 +00:00
committed by Gerrit Code Review
parent 046bb4b08a 5f90649036
commit c02e7d4017
5 changed files with 27 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bp2build/apex_conversion_test.go
View File

@@ -1191,9 +1191,9 @@ 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{
"soname": `"foo.so"`, "soname": `"foo.so"`,
"source_library": `":foo"`, "source_library_label": `"//:foo"`,
"symbol_file": `"foo.map.txt"`, "symbol_file": `"foo.map.txt"`,
"versions": `[ "versions": `[
"28", "28",
"29", "29",

6
bp2build/cc_library_conversion_test.go
View File

@@ -2780,9 +2780,9 @@ 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{
"soname": `"a.so"`, "soname": `"a.so"`,
"source_library": `":a"`, "source_library_label": `"//foo/bar:a"`,
"stubs_symbol_file": `"a.map.txt"`, "stubs_symbol_file": `"a.map.txt"`,
"stubs_versions": `[ "stubs_versions": `[
"28", "28",
"29", "29",

6
bp2build/cc_library_shared_conversion_test.go
View File

@@ -540,9 +540,9 @@ cc_library_shared {
}, },
Blueprint: soongCcLibraryPreamble, Blueprint: soongCcLibraryPreamble,
ExpectedBazelTargets: []string{makeCcStubSuiteTargets("a", AttrNameToString{ ExpectedBazelTargets: []string{makeCcStubSuiteTargets("a", AttrNameToString{
"soname": `"a.so"`, "soname": `"a.so"`,
"source_library": `":a"`, "source_library_label": `"//foo/bar:a"`,
"stubs_symbol_file": `"a.map.txt"`, "stubs_symbol_file": `"a.map.txt"`,
"stubs_versions": `[ "stubs_versions": `[
"28", "28",
"29", "29",

10
bp2build/testing.go
View File

@@ -623,16 +623,18 @@ func makeCcStubSuiteTargets(name string, attrs AttrNameToString) string {
return "" return ""
} }
STUB_SUITE_ATTRS := map[string]string{ STUB_SUITE_ATTRS := map[string]string{
"stubs_symbol_file": "symbol_file", "stubs_symbol_file": "symbol_file",
"stubs_versions": "versions", "stubs_versions": "versions",
"soname": "soname", "soname": "soname",
"source_library": "source_library", "source_library_label": "source_library_label",
} }
stubSuiteAttrs := AttrNameToString{} stubSuiteAttrs := AttrNameToString{}
for key, _ := range attrs { for key, _ := range attrs {
if _, stubSuiteAttr := STUB_SUITE_ATTRS[key]; stubSuiteAttr { if _, stubSuiteAttr := STUB_SUITE_ATTRS[key]; stubSuiteAttr {
stubSuiteAttrs[STUB_SUITE_ATTRS[key]] = attrs[key] stubSuiteAttrs[STUB_SUITE_ATTRS[key]] = attrs[key]
} else {
panic(fmt.Sprintf("unused cc_stub_suite attr %q\n", key))
} }
} }
return MakeBazelTarget("cc_stub_suite", name+"_stub_libs", stubSuiteAttrs) return MakeBazelTarget("cc_stub_suite", name+"_stub_libs", stubSuiteAttrs)

24
cc/library.go
View File

@@ -454,12 +454,12 @@ func createStubsBazelTargetIfNeeded(ctx android.TopDownMutatorContext, m *Module
} }
soname := m.Name() + ".so" soname := m.Name() + ".so"
stubSuitesAttrs := &bazelCcStubSuiteAttributes{ stubSuitesAttrs := &bazelCcStubSuiteAttributes{
Symbol_file: compilerAttrs.stubsSymbolFile, Symbol_file: compilerAttrs.stubsSymbolFile,
Versions: compilerAttrs.stubsVersions, Versions: compilerAttrs.stubsVersions,
Export_includes: exportedIncludes.Includes, Export_includes: exportedIncludes.Includes,
Soname: &soname, Soname: &soname,
Source_library: *bazel.MakeLabelAttribute(":" + m.Name()), Source_library_label: proptools.StringPtr(m.GetBazelLabel(ctx, m)),
Deps: baseAttributes.deps, Deps: baseAttributes.deps,
} }
ctx.CreateBazelTargetModule(stubSuitesProps, ctx.CreateBazelTargetModule(stubSuitesProps,
android.CommonAttributes{Name: m.Name() + "_stub_libs"}, android.CommonAttributes{Name: m.Name() + "_stub_libs"},
@@ -3033,12 +3033,12 @@ type bazelCcLibrarySharedAttributes struct {
} }
type bazelCcStubSuiteAttributes struct { type bazelCcStubSuiteAttributes struct {
Symbol_file *string Symbol_file *string
Versions bazel.StringListAttribute Versions bazel.StringListAttribute
Export_includes bazel.StringListAttribute Export_includes bazel.StringListAttribute
Source_library bazel.LabelAttribute Source_library_label *string
Soname *string Soname *string
Deps bazel.LabelListAttribute Deps bazel.LabelListAttribute
} }
type bazelCcHeaderAbiCheckerAttributes struct { type bazelCcHeaderAbiCheckerAttributes struct {