Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f19d8a7f authored by Trevor Radcliffe's avatar Trevor Radcliffe
Browse files

Only generate stubs for shared libraries 

Bug: 246958825
Test: Unit tests
Test: m nothing
Change-Id: If976027314b079525397fa8f5d6dc3de9f1221c8
parent 9f6e6238

bp2build/cc_library_shared_conversion_test.go

+9 −10
Original line number Diff line number Diff line
@@ -488,10 +488,7 @@ cc_library_shared { 
`,

		},

		Blueprint: soongCcLibraryPreamble,

		ExpectedBazelTargets: []string{MakeBazelTarget("cc_library_shared", "a", AttrNameToString{

			"has_stubs": `True`,

		}),

			makeCcStubSuiteTargets("a", AttrNameToString{

		ExpectedBazelTargets: []string{makeCcStubSuiteTargets("a", AttrNameToString{

			"soname":            `"a.so"`,

			"source_library":    `":a"`,

			"stubs_symbol_file": `"a.map.txt"`,
@@ -501,9 +498,11 @@ cc_library_shared { 
        "current",

    ]`,

		}),

			MakeBazelTarget("cc_library_shared", "a", AttrNameToString{

				"has_stubs": `True`,

			}),

		},

	},

	)

	})

}



func TestCcLibrarySharedSystemSharedLibsSharedEmpty(t *testing.T) {

cc/library.go

+1 −2
Original line number Diff line number Diff line
@@ -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?