Merge "Remove creation of has_stubs in cc_library_shared by bp2build"
diff --git a/bp2build/cc_library_conversion_test.go b/bp2build/cc_library_conversion_test.go
index 728225a..fdef406 100644
--- a/bp2build/cc_library_conversion_test.go
+++ b/bp2build/cc_library_conversion_test.go
@@ -1409,7 +1409,6 @@
"linkopts": true,
"strip": true,
"inject_bssl_hash": true,
- "has_stubs": true,
"stubs_symbol_file": true,
"use_version_lib": true,
}
@@ -2712,7 +2711,6 @@
func TestCcLibraryStubs(t *testing.T) {
expectedBazelTargets := makeCcLibraryTargets("a", AttrNameToString{
- "has_stubs": `True`,
"stubs_symbol_file": `"a.map.txt"`,
})
expectedBazelTargets = append(expectedBazelTargets, makeCcStubSuiteTargets("a", AttrNameToString{
diff --git a/bp2build/cc_library_shared_conversion_test.go b/bp2build/cc_library_shared_conversion_test.go
index 7e1d111..14b6f0d 100644
--- a/bp2build/cc_library_shared_conversion_test.go
+++ b/bp2build/cc_library_shared_conversion_test.go
@@ -543,7 +543,6 @@
]`,
}),
MakeBazelTarget("cc_library_shared", "a", AttrNameToString{
- "has_stubs": `True`,
"stubs_symbol_file": `"a.map.txt"`,
}),
},
diff --git a/cc/library.go b/cc/library.go
index 8afc2fe..5760071 100644
--- a/cc/library.go
+++ b/cc/library.go
@@ -424,8 +424,6 @@
}
if compilerAttrs.stubsSymbolFile != nil && len(compilerAttrs.stubsVersions.Value) > 0 {
- hasStubs := true
- sharedTargetAttrs.Has_stubs.SetValue(&hasStubs)
sharedTargetAttrs.Stubs_symbol_file = compilerAttrs.stubsSymbolFile
}
@@ -2939,8 +2937,6 @@
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
@@ -3026,7 +3022,6 @@
Features bazel.StringListAttribute
- Has_stubs bazel.BoolAttribute
Stubs_symbol_file *string
Inject_bssl_hash bazel.BoolAttribute