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

24
cc/library.go
View File

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