Merge "Fix gofmt"

common/module.go

@@ -595,7 +595,7 @@ func (c *buildTargetSingleton) GenerateBuildActions(ctx blueprint.SingletonConte
 			Implicits: dirModules[dir],
 			// HACK: checkbuild should be an optional build, but force it
 			// enabled for now in standalone builds
-			Optional:  ctx.Config().(Config).EmbeddedInMake(),
+			Optional: ctx.Config().(Config).EmbeddedInMake(),
 		})
 	}
 }

genrule/genrule.go

@@ -86,9 +86,9 @@ func genruleDepsMutator(ctx common.AndroidBottomUpMutatorContext) {
 	if g, ok := ctx.Module().(*generator); ok {
 		if g.properties.Tool != "" {
 			ctx.AddFarVariationDependencies([]blueprint.Variation{
-					{"host_or_device", common.Host.String()},
-					{"host_type", common.CurrentHostType().String()},
-				}, g.properties.Tool)
+				{"host_or_device", common.Host.String()},
+				{"host_type", common.CurrentHostType().String()},
+			}, g.properties.Tool)
 		}
 	}
 }