Remove creation of has_stubs in cc_library_shared by bp2build

Because when stubs_symbol_file is defined on cc_library_shared, has_stubs is already implied to be true.

Bug: 260771171
Test: go test
Change-Id: I3b9a2cfb9000411d1b5f22da87dc339267775799
This commit is contained in:
Vinh Tran
2022-12-15 11:16:19 -05:00
parent 52b842a1fa
commit 83f88cdc8b
3 changed files with 0 additions and 8 deletions

View File

@@ -1408,7 +1408,6 @@ func makeCcLibraryTargets(name string, attrs AttrNameToString) []string {
"linkopts": true,
"strip": true,
"inject_bssl_hash": true,
"has_stubs": true,
"stubs_symbol_file": true,
"use_version_lib": true,
}
@@ -2711,7 +2710,6 @@ func TestCcLibraryStaticDisabledForSomeArch(t *testing.T) {
func TestCcLibraryStubs(t *testing.T) {
expectedBazelTargets := makeCcLibraryTargets("a", AttrNameToString{
"has_stubs": `True`,
"stubs_symbol_file": `"a.map.txt"`,
})
expectedBazelTargets = append(expectedBazelTargets, makeCcStubSuiteTargets("a", AttrNameToString{

View File

@@ -543,7 +543,6 @@ cc_library_shared {
]`,
}),
MakeBazelTarget("cc_library_shared", "a", AttrNameToString{
"has_stubs": `True`,
"stubs_symbol_file": `"a.map.txt"`,
}),
},

View File

@@ -422,8 +422,6 @@ func libraryBp2Build(ctx android.TopDownMutatorContext, m *Module) {
}
if compilerAttrs.stubsSymbolFile != nil && len(compilerAttrs.stubsVersions.Value) > 0 {
hasStubs := true
sharedTargetAttrs.Has_stubs.SetValue(&hasStubs)
sharedTargetAttrs.Stubs_symbol_file = compilerAttrs.stubsSymbolFile
}
@@ -2936,8 +2934,6 @@ func sharedOrStaticLibraryBp2Build(ctx android.TopDownMutatorContext, module *Mo
Fdo_profile: compilerAttrs.fdoProfile,
}
if compilerAttrs.stubsSymbolFile != nil && len(compilerAttrs.stubsVersions.Value) > 0 {
hasStubs := true
sharedLibAttrs.Has_stubs.SetValue(&hasStubs)
sharedLibAttrs.Stubs_symbol_file = compilerAttrs.stubsSymbolFile
}
attrs = sharedLibAttrs
@@ -3016,7 +3012,6 @@ type bazelCcLibrarySharedAttributes struct {
Features bazel.StringListAttribute
Has_stubs bazel.BoolAttribute
Stubs_symbol_file *string
Inject_bssl_hash bazel.BoolAttribute