From 09364fd955c38983f8cd05133e9685e2502f0d09 Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Mon, 8 Apr 2019 13:00:40 -0700 Subject: [PATCH] Fix python proto srczip argument order -P has to come before -D to have an effect on the files read from the directory. Fixes: 130160833 Test: atest acloud_test Change-Id: I62a998f1ad1e3b45f590babbf39330955d368373 --- python/proto.go | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/python/proto.go b/python/proto.go index b3ffaa670..85ed1a517 100644 --- a/python/proto.go +++ b/python/proto.go @@ -35,12 +35,12 @@ func genProto(ctx android.ModuleContext, protoFile android.Path, flags android.P // into a srcszip. zipCmd := rule.Command(). Tool(ctx.Config().HostToolPath(ctx, "soong_zip")). - FlagWithOutput("-o ", srcsZipFile). - FlagWithArg("-C ", outDir.String()). - FlagWithArg("-D ", outDir.String()) + FlagWithOutput("-o ", srcsZipFile) if pkgPath != "" { zipCmd.FlagWithArg("-P ", pkgPath) } + zipCmd.FlagWithArg("-C ", outDir.String()). + FlagWithArg("-D ", outDir.String()) rule.Command().Text("rm -rf").Flag(outDir.String())