diff options
| -rw-r--r-- | bp2build/cc_library_shared_conversion_test.go | 19 | ||||
| -rw-r--r-- | cc/library.go | 3 |
2 files changed, 10 insertions, 12 deletions
diff --git a/bp2build/cc_library_shared_conversion_test.go b/bp2build/cc_library_shared_conversion_test.go index 48515c852..1bc3ec03f 100644 --- a/bp2build/cc_library_shared_conversion_test.go +++ b/bp2build/cc_library_shared_conversion_test.go @@ -488,22 +488,21 @@ cc_library_shared { `, }, Blueprint: soongCcLibraryPreamble, - ExpectedBazelTargets: []string{MakeBazelTarget("cc_library_shared", "a", AttrNameToString{ - "has_stubs": `True`, - }), - makeCcStubSuiteTargets("a", AttrNameToString{ - "soname": `"a.so"`, - "source_library": `":a"`, - "stubs_symbol_file": `"a.map.txt"`, - "stubs_versions": `[ + ExpectedBazelTargets: []string{makeCcStubSuiteTargets("a", AttrNameToString{ + "soname": `"a.so"`, + "source_library": `":a"`, + "stubs_symbol_file": `"a.map.txt"`, + "stubs_versions": `[ "28", "29", "current", ]`, + }), + MakeBazelTarget("cc_library_shared", "a", AttrNameToString{ + "has_stubs": `True`, }), }, - }, - ) + }) } func TestCcLibrarySharedSystemSharedLibsSharedEmpty(t *testing.T) { diff --git a/cc/library.go b/cc/library.go index 83a2c6875..56534a6b4 100644 --- a/cc/library.go +++ b/cc/library.go @@ -2704,6 +2704,7 @@ func sharedOrStaticLibraryBp2Build(ctx android.TopDownMutatorContext, module *Mo modType = "cc_library_static" } else { modType = "cc_library_shared" + createStubsBazelTargetIfNeeded(ctx, module, compilerAttrs, exportedIncludes, baseAttributes) } props := bazel.BazelTargetModuleProperties{ Rule_class: modType, @@ -2711,8 +2712,6 @@ func sharedOrStaticLibraryBp2Build(ctx android.TopDownMutatorContext, module *Mo } ctx.CreateBazelTargetModule(props, android.CommonAttributes{Name: module.Name()}, attrs) - - createStubsBazelTargetIfNeeded(ctx, module, compilerAttrs, exportedIncludes, baseAttributes) } // TODO(b/199902614): Can this be factored to share with the other Attributes? |