diff --git a/bp2build/cc_library_conversion_test.go b/bp2build/cc_library_conversion_test.go index ee6e5b807..14cd39c52 100644 --- a/bp2build/cc_library_conversion_test.go +++ b/bp2build/cc_library_conversion_test.go @@ -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{ diff --git a/bp2build/cc_library_shared_conversion_test.go b/bp2build/cc_library_shared_conversion_test.go index 7e1d1117d..14b6f0d2f 100644 --- a/bp2build/cc_library_shared_conversion_test.go +++ b/bp2build/cc_library_shared_conversion_test.go @@ -543,7 +543,6 @@ cc_library_shared { ]`, }), 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 ed0ed01bc..32375a54a 100644 --- a/cc/library.go +++ b/cc/library.go @@ -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