Merge "Fix python proto srczip argument order"

This commit is contained in:
Colin Cross
2019-04-09 13:44:15 +00:00
committed by Gerrit Code Review

View File

@@ -35,12 +35,12 @@ func genProto(ctx android.ModuleContext, protoFile android.Path, flags android.P
// into a srcszip. // into a srcszip.
zipCmd := rule.Command(). zipCmd := rule.Command().
Tool(ctx.Config().HostToolPath(ctx, "soong_zip")). Tool(ctx.Config().HostToolPath(ctx, "soong_zip")).
FlagWithOutput("-o ", srcsZipFile). FlagWithOutput("-o ", srcsZipFile)
FlagWithArg("-C ", outDir.String()).
FlagWithArg("-D ", outDir.String())
if pkgPath != "" { if pkgPath != "" {
zipCmd.FlagWithArg("-P ", pkgPath) zipCmd.FlagWithArg("-P ", pkgPath)
} }
zipCmd.FlagWithArg("-C ", outDir.String()).
FlagWithArg("-D ", outDir.String())
rule.Command().Text("rm -rf").Flag(outDir.String()) rule.Command().Text("rm -rf").Flag(outDir.String())