Merge "Register singletons in api_bp2build" am: c74bf95708

Original change: https://android-review.googlesource.com/c/platform/build/soong/+/2322299

Change-Id: Ica8c1966b0c3063fd58d488179a075a46ad598b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

android/register.go

@@ -165,29 +165,30 @@ func NewContext(config Config) *Context {
 	return ctx
 }
 
-// RegisterForBazelConversion registers an alternate shadow pipeline of
+// Helper function to register the module types used in bp2build and
-// singletons, module types and mutators to register for converting Blueprint
+// api_bp2build.
-// files to semantically equivalent BUILD files.
+func registerModuleTypes(ctx *Context) {
-func (ctx *Context) RegisterForBazelConversion() {
 	for _, t := range moduleTypes {
 		t.register(ctx)
 	}
-
 	// Required for SingletonModule types, even though we are not using them.
 	for _, t := range singletons {
 		t.register(ctx)
 	}
+}
 
+// RegisterForBazelConversion registers an alternate shadow pipeline of
+// singletons, module types and mutators to register for converting Blueprint
+// files to semantically equivalent BUILD files.
+func (ctx *Context) RegisterForBazelConversion() {
+	registerModuleTypes(ctx)
 	RegisterMutatorsForBazelConversion(ctx, bp2buildPreArchMutators)
 }
 
 // RegisterForApiBazelConversion is similar to RegisterForBazelConversion except that
 // it only generates API targets in the generated  workspace
 func (ctx *Context) RegisterForApiBazelConversion() {
-	for _, t := range moduleTypes {
+	registerModuleTypes(ctx)
-		t.register(ctx)
-	}
-
 	RegisterMutatorsForApiBazelConversion(ctx, bp2buildPreArchMutators)
 }