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

Commit 87318085 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

Merge "Dedup cc binary build components registration" am: e24093a7 

Change-Id: I671227906222038e87f0a94b05f1674bf7ad9e5d
parents 7f270949 e24093a7

apex/apex_test.go

+0 −1
Original line number Diff line number Diff line
@@ -288,7 +288,6 @@ func testApexContext(t *testing.T, bp string, handlers ...testCustomizer) (*andr 
	ctx.RegisterModuleType("override_apex", overrideApexFactory)



	cc.RegisterRequiredBuildComponentsForTest(ctx)

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

	ctx.RegisterModuleType("cc_test", cc.TestFactory)

	ctx.RegisterModuleType("vndk_prebuilt_shared", cc.VndkPrebuiltSharedFactory)

	ctx.RegisterModuleType("vndk_libraries_txt", cc.VndkLibrariesTxtFactory)

cc/binary.go

+6 −2
Original line number Diff line number Diff line
@@ -56,8 +56,12 @@ type BinaryLinkerProperties struct { 
}



func init() {

	android.RegisterModuleType("cc_binary", BinaryFactory)

	android.RegisterModuleType("cc_binary_host", binaryHostFactory)

	RegisterBinaryBuildComponents(android.InitRegistrationContext)

}



func RegisterBinaryBuildComponents(ctx android.RegistrationContext) {

	ctx.RegisterModuleType("cc_binary", BinaryFactory)

	ctx.RegisterModuleType("cc_binary_host", binaryHostFactory)

}



// cc_binary produces a binary that is runnable on a device.

cc/testing.go

+1 −2
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ func RegisterRequiredBuildComponentsForTest(ctx android.RegistrationContext) { 
	android.RegisterPrebuiltMutators(ctx)



	RegisterCCBuildComponents(ctx)

	RegisterBinaryBuildComponents(ctx)

	RegisterLibraryBuildComponents(ctx)



	ctx.RegisterModuleType("toolchain_library", ToolchainLibraryFactory)
@@ -305,8 +306,6 @@ func TestConfig(buildDir string, os android.OsType, env map[string]string, 


func CreateTestContext() *android.TestContext {

	ctx := android.NewTestArchContext()

	ctx.RegisterModuleType("cc_binary", BinaryFactory)

	ctx.RegisterModuleType("cc_binary_host", binaryHostFactory)

	ctx.RegisterModuleType("cc_fuzz", FuzzFactory)

	ctx.RegisterModuleType("cc_test", TestFactory)

	ctx.RegisterModuleType("llndk_headers", llndkHeadersFactory)