Merge "Dedup cc build components registration" (4565aba9) · Commits · e / os / android_build_soong

apex/apex_test.go

+0 −3

Original line number	Diff line number	Diff line
		@@ -290,9 +290,6 @@ func testApexContext(t testing.T, bp string, handlers ...testCustomizer) (andr
		ctx.RegisterModuleType("cc_library_headers", cc.LibraryHeaderFactory)
		cc.RegisterRequiredBuildComponentsForTest(ctx)
		ctx.RegisterModuleType("cc_binary", cc.BinaryFactory)
		ctx.RegisterModuleType("cc_defaults", func() android.Module {
		return cc.DefaultsFactory()
		})
		ctx.RegisterModuleType("cc_test", cc.TestFactory)
		ctx.RegisterModuleType("vndk_prebuilt_shared", cc.VndkPrebuiltSharedFactory)
		ctx.RegisterModuleType("vndk_libraries_txt", cc.VndkLibrariesTxtFactory)

cc/cc.go

+9 −4

Original line number	Diff line number	Diff line
		@@ -33,9 +33,15 @@ import (
		)

		func init() {
		android.RegisterModuleType("cc_defaults", defaultsFactory)
		RegisterCCBuildComponents(android.InitRegistrationContext)

		android.PreDepsMutators(func(ctx android.RegisterMutatorsContext) {
		pctx.Import("android/soong/cc/config")
		}

		func RegisterCCBuildComponents(ctx android.RegistrationContext) {
		ctx.RegisterModuleType("cc_defaults", defaultsFactory)

		ctx.PreDepsMutators(func(ctx android.RegisterMutatorsContext) {
		ctx.BottomUp("vndk", VndkMutator).Parallel()
		ctx.BottomUp("link", LinkageMutator).Parallel()
		ctx.BottomUp("ndk_api", NdkApiMutator).Parallel()
		@@ -45,7 +51,7 @@ func init() {
		ctx.BottomUp("sysprop_cc", SyspropMutator).Parallel()
		})

		android.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {
		ctx.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {
		ctx.TopDown("asan_deps", sanitizerDepsMutator(asan))
		ctx.BottomUp("asan", sanitizerMutator(asan)).Parallel()

		@@ -79,7 +85,6 @@ func init() {
		})

		android.RegisterSingletonType("kythe_extract_all", kytheExtractAllFactory)
		pctx.Import("android/soong/cc/config")
		}

		type Deps struct {

cc/testing.go

+2 −20

Original line number	Diff line number	Diff line
		@@ -26,22 +26,8 @@ func RegisterRequiredBuildComponentsForTest(ctx android.RegistrationContext) {
		ctx.RegisterModuleType("cc_object", ObjectFactory)

		android.RegisterPrebuiltMutators(ctx)
		ctx.PreDepsMutators(func(ctx android.RegisterMutatorsContext) {
		ctx.BottomUp("vndk", VndkMutator).Parallel()
		ctx.BottomUp("link", LinkageMutator).Parallel()
		ctx.BottomUp("ndk_api", NdkApiMutator).Parallel()
		ctx.BottomUp("test_per_src", TestPerSrcMutator).Parallel()
		ctx.BottomUp("version", VersionMutator).Parallel()
		ctx.BottomUp("begin", BeginMutator).Parallel()
		ctx.BottomUp("sysprop_cc", SyspropMutator).Parallel()
		})
		ctx.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {
		ctx.TopDown("fuzzer_deps", sanitizerDepsMutator(fuzzer))
		ctx.BottomUp("fuzzer", sanitizerMutator(fuzzer)).Parallel()

		ctx.TopDown("sanitize_runtime_deps", sanitizerRuntimeDepsMutator).Parallel()
		ctx.BottomUp("sanitize_runtime", sanitizerRuntimeMutator).Parallel()
		})

		RegisterCCBuildComponents(ctx)
		}

		func GatherRequiredDepsForTest(os android.OsType) string {
		@@ -319,7 +305,6 @@ func TestConfig(buildDir string, os android.OsType, env map[string]string,

		func CreateTestContext() *android.TestContext {
		ctx := android.NewTestArchContext()
		ctx.RegisterModuleType("cc_defaults", defaultsFactory)
		ctx.RegisterModuleType("cc_binary", BinaryFactory)
		ctx.RegisterModuleType("cc_binary_host", binaryHostFactory)
		ctx.RegisterModuleType("cc_fuzz", FuzzFactory)
		@@ -334,9 +319,6 @@ func CreateTestContext() *android.TestContext {
		ctx.RegisterModuleType("vndk_prebuilt_shared", VndkPrebuiltSharedFactory)
		ctx.RegisterModuleType("vndk_libraries_txt", VndkLibrariesTxtFactory)
		RegisterRequiredBuildComponentsForTest(ctx)
		ctx.PostDepsMutators(func(ctx android.RegisterMutatorsContext) {
		ctx.TopDown("double_loadable", checkDoubleLoadableLibraries).Parallel()
		})
		ctx.PreArchMutators(android.RegisterDefaultsPreArchMutators)
		ctx.RegisterSingletonType("vndk-snapshot", VndkSnapshotSingleton)