Merge "Convert orderfile mutators to TransitionMutator" into main

cc/cc.go

@@ -73,8 +73,7 @@ func RegisterCCBuildComponents(ctx android.RegistrationContext) {
 		ctx.TopDown("afdo_deps", afdoDepsMutator)
 		ctx.BottomUp("afdo", afdoMutator).Parallel()
 
-		ctx.TopDown("orderfile_deps", orderfileDepsMutator)
+		ctx.Transition("orderfile", &orderfileTransitionMutator{})
-		ctx.BottomUp("orderfile", orderfileMutator).Parallel()
 
 		ctx.Transition("lto", &ltoTransitionMutator{})
 

cc/orderfile.go

@@ -20,6 +20,8 @@ package cc
 import (
 	"fmt"
 
+	"github.com/google/blueprint"
+
 	"android/soong/android"
 )
 
@@ -190,66 +192,61 @@ func (orderfile *orderfile) flags(ctx ModuleContext, flags Flags) Flags {
 	return flags
 }
 
-// Propagate profile orderfile flags down from binaries and shared libraries
+func orderfilePropagateViaDepTag(tag blueprint.DependencyTag) bool {
-// We do not allow propagation for load flags because the orderfile is specific
-// to the module (binary / shared library)
-func orderfileDepsMutator(mctx android.TopDownMutatorContext) {
-	if m, ok := mctx.Module().(*Module); ok {
-		if !m.orderfile.orderfileLinkEnabled() {
-			return
-		}
-		mctx.WalkDeps(func(dep android.
-			Module, parent android.Module) bool {
-			tag := mctx.OtherModuleDependencyTag(dep)
 	libTag, isLibTag := tag.(libraryDependencyTag)
-
 	// Do not recurse down non-static dependencies
 	if isLibTag {
-				if !libTag.static() {
+		return libTag.static()
-					return false
-				}
 	} else {
-				if tag != objDepTag && tag != reuseObjTag {
+		return tag == objDepTag || tag == reuseObjTag || tag == staticVariantTag
-					return false
 	}
 }
 
-			if dep, ok := dep.(*Module); ok {
+// orderfileTransitionMutator creates orderfile variants of cc modules.
-				if m.orderfile.Properties.OrderfileInstrLink {
+type orderfileTransitionMutator struct{}
-					dep.orderfile.Properties.OrderfileInstrLink = true
+
-				}
+const ORDERFILE_VARIATION = "orderfile"
+
+func (o *orderfileTransitionMutator) Split(ctx android.BaseModuleContext) []string {
+	return []string{""}
 }
 
-			return true
+func (o *orderfileTransitionMutator) OutgoingTransition(ctx android.OutgoingTransitionContext, sourceVariation string) string {
-		})
+	if m, ok := ctx.Module().(*Module); ok && m.orderfile != nil {
-	}
+		if !orderfilePropagateViaDepTag(ctx.DepTag()) {
+			return ""
 		}
 
-// Create orderfile variants for modules that need them
+		if sourceVariation != "" {
-func orderfileMutator(mctx android.BottomUpMutatorContext) {
+			return sourceVariation
-	if m, ok := mctx.Module().(*Module); ok && m.orderfile != nil {
+		}
-		if !m.static() && m.orderfile.orderfileEnabled() {
+
-			mctx.SetDependencyVariation("orderfile")
+		// Propagate profile orderfile flags down from binaries and shared libraries
+		if m.orderfile.orderfileLinkEnabled() {
+			return ORDERFILE_VARIATION
+		}
+	}
+	return ""
+}
+
+func (o *orderfileTransitionMutator) IncomingTransition(ctx android.IncomingTransitionContext, incomingVariation string) string {
+	if m, ok := ctx.Module().(*Module); ok && m.orderfile != nil {
+		return incomingVariation
+	}
+	return ""
+}
+
+func (o *orderfileTransitionMutator) Mutate(ctx android.BottomUpMutatorContext, variation string) {
+	if variation == "" {
 		return
 	}
 
-		variationNames := []string{""}
+	if m, ok := ctx.Module().(*Module); ok && m.orderfile != nil {
-		if m.orderfile.Properties.OrderfileInstrLink {
+		m.Properties.PreventInstall = true
-			variationNames = append(variationNames, "orderfile")
+		m.Properties.HideFromMake = true
-		}
+		m.orderfile.Properties.ShouldProfileModule = true
-
+		// We do not allow propagation for load flags because the orderfile is specific
-		if len(variationNames) > 1 {
+		// to the module (binary / shared library)
-			modules := mctx.CreateVariations(variationNames...)
+		m.orderfile.Properties.OrderfileLoad = false
-			for i, name := range variationNames {
-				if name == "" {
-					continue
-				}
-				variation := modules[i].(*Module)
-				variation.Properties.PreventInstall = true
-				variation.Properties.HideFromMake = true
-				variation.orderfile.Properties.ShouldProfileModule = true
-				variation.orderfile.Properties.OrderfileLoad = false
-			}
-		}
 	}
 }