diff options
Diffstat (limited to 'android/proto.go')
| -rw-r--r-- | android/proto.go | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/android/proto.go b/android/proto.go index 5247c68dc..b712258eb 100644 --- a/android/proto.go +++ b/android/proto.go @@ -52,9 +52,8 @@ func ProtoDeps(ctx BottomUpMutatorContext, p *ProtoProperties) { } if plugin := String(p.Proto.Plugin); plugin != "" { - ctx.AddFarVariationDependencies([]blueprint.Variation{ - {Mutator: "arch", Variation: ctx.Config().BuildOsVariant}, - }, ProtoPluginDepTag, "protoc-gen-"+plugin) + ctx.AddFarVariationDependencies(ctx.Config().BuildOSTarget.Variations(), + ProtoPluginDepTag, "protoc-gen-"+plugin) } } @@ -135,7 +134,7 @@ func ProtoRule(ctx ModuleContext, rule *RuleBuilder, protoFile Path, flags Proto } rule.Command(). - Tool(ctx.Config().HostToolPath(ctx, "aprotoc")). + BuiltTool(ctx, "aprotoc"). FlagWithArg(flags.OutTypeFlag+"=", strings.Join(flags.OutParams, ",")+":"+outDir.String()). FlagWithDepFile("--dependency_out=", depFile). FlagWithArg("-I ", protoBase). @@ -145,5 +144,5 @@ func ProtoRule(ctx ModuleContext, rule *RuleBuilder, protoFile Path, flags Proto ImplicitOutputs(outputs) rule.Command(). - Tool(ctx.Config().HostToolPath(ctx, "dep_fixer")).Flag(depFile.String()) + BuiltTool(ctx, "dep_fixer").Flag(depFile.String()) } |