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

Commit 13c5d781 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Change-Id: Id1ecda6c1f14c714d8aa22b5efddd0ba3c7300fe
parents 90da86ef bdcf05af

apex/apex_test.go

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

	ctx.RegisterModuleType("override_apex", overrideApexFactory)





	cc.RegisterRequiredBuildComponentsForTest(ctx)

	cc.RegisterRequiredBuildComponentsForTest(ctx)

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

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

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

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

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

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

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

cc/binary.go

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

}





func init() {

func init() {

	android.RegisterModuleType("cc_binary", BinaryFactory)

	RegisterBinaryBuildComponents(android.InitRegistrationContext)

	android.RegisterModuleType("cc_binary_host", binaryHostFactory)

}



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_binary produces a binary that is runnable on a device.

cc/testing.go

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

	android.RegisterPrebuiltMutators(ctx)





	RegisterCCBuildComponents(ctx)

	RegisterCCBuildComponents(ctx)

	RegisterBinaryBuildComponents(ctx)

	RegisterLibraryBuildComponents(ctx)

	RegisterLibraryBuildComponents(ctx)





	ctx.RegisterModuleType("toolchain_library", ToolchainLibraryFactory)

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




func CreateTestContext() *android.TestContext {

func CreateTestContext() *android.TestContext {

	ctx := android.NewTestArchContext()

	ctx := android.NewTestArchContext()

	ctx.RegisterModuleType("cc_binary", BinaryFactory)

	ctx.RegisterModuleType("cc_binary_host", binaryHostFactory)

	ctx.RegisterModuleType("cc_fuzz", FuzzFactory)

	ctx.RegisterModuleType("cc_fuzz", FuzzFactory)

	ctx.RegisterModuleType("cc_test", TestFactory)

	ctx.RegisterModuleType("cc_test", TestFactory)

	ctx.RegisterModuleType("llndk_headers", llndkHeadersFactory)

	ctx.RegisterModuleType("llndk_headers", llndkHeadersFactory)