Merge "Fix python proto srczip argument order"
am: 7dd6ceb3b9
Change-Id: Ifa0377dc2b1ebc8d91ef28c06fe4d8d26f76547a
This commit is contained in:
@@ -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())
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user