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

Commit 59986b23 authored by Paul Duffin's avatar Paul Duffin
Browse files

Dedup cc prebuilts module type registration 

Test: m checkbuild
Bug: 146540677
Change-Id: I7e9440a075ef9c683729ed83e0033ab529fe4ac0
parent 0a286830

apex/apex_test.go

+1 −2
Original line number Diff line number Diff line
@@ -289,8 +289,7 @@ func testApexContext(t *testing.T, bp string, handlers ...testCustomizer) (*andr 
	ctx.RegisterModuleType("cc_library", cc.LibraryFactory)

	ctx.RegisterModuleType("cc_library_shared", cc.LibrarySharedFactory)

	ctx.RegisterModuleType("cc_library_headers", cc.LibraryHeaderFactory)

	ctx.RegisterModuleType("cc_prebuilt_library_shared", cc.PrebuiltSharedLibraryFactory)

	ctx.RegisterModuleType("cc_prebuilt_library_static", cc.PrebuiltStaticLibraryFactory)

	cc.RegisterPrebuiltBuildComponents(ctx)

	ctx.RegisterModuleType("cc_binary", cc.BinaryFactory)

	ctx.RegisterModuleType("cc_object", cc.ObjectFactory)

	ctx.RegisterModuleType("cc_defaults", func() android.Module {

cc/prebuilt.go

+7 −3
Original line number Diff line number Diff line
@@ -19,9 +19,13 @@ import ( 
)



func init() {

	android.RegisterModuleType("cc_prebuilt_library_shared", PrebuiltSharedLibraryFactory)

	android.RegisterModuleType("cc_prebuilt_library_static", PrebuiltStaticLibraryFactory)

	android.RegisterModuleType("cc_prebuilt_binary", prebuiltBinaryFactory)

	RegisterPrebuiltBuildComponents(android.InitRegistrationContext)

}



func RegisterPrebuiltBuildComponents(ctx android.RegistrationContext) {

	ctx.RegisterModuleType("cc_prebuilt_library_shared", PrebuiltSharedLibraryFactory)

	ctx.RegisterModuleType("cc_prebuilt_library_static", PrebuiltStaticLibraryFactory)

	ctx.RegisterModuleType("cc_prebuilt_binary", prebuiltBinaryFactory)

}



type prebuiltLinkerInterface interface {

cc/prebuilt_test.go

+1 −3
Original line number Diff line number Diff line
@@ -72,9 +72,7 @@ func TestPrebuilt(t *testing.T) { 


	ctx := CreateTestContext()



	ctx.RegisterModuleType("cc_prebuilt_library_shared", PrebuiltSharedLibraryFactory)

	ctx.RegisterModuleType("cc_prebuilt_library_static", PrebuiltStaticLibraryFactory)

	ctx.RegisterModuleType("cc_prebuilt_binary", prebuiltBinaryFactory)

	RegisterPrebuiltBuildComponents(ctx)



	ctx.PreArchMutators(android.RegisterPrebuiltsPreArchMutators)

	ctx.PostDepsMutators(android.RegisterPrebuiltsPostDepsMutators)

sdk/testing.go

+1 −2
Original line number Diff line number Diff line
@@ -87,8 +87,7 @@ func testSdkContext(bp string, fs map[string][]byte) (*android.TestContext, andr 
	ctx.RegisterModuleType("cc_library_shared", cc.LibrarySharedFactory)

	ctx.RegisterModuleType("cc_library_static", cc.LibraryStaticFactory)

	ctx.RegisterModuleType("cc_object", cc.ObjectFactory)

	ctx.RegisterModuleType("cc_prebuilt_library_shared", cc.PrebuiltSharedLibraryFactory)

	ctx.RegisterModuleType("cc_prebuilt_library_static", cc.PrebuiltStaticLibraryFactory)

	cc.RegisterPrebuiltBuildComponents(ctx)

	ctx.RegisterModuleType("llndk_library", cc.LlndkLibraryFactory)

	ctx.RegisterModuleType("toolchain_library", cc.ToolchainLibraryFactory)

	ctx.PreDepsMutators(func(ctx android.RegisterMutatorsContext) {