diff options
| author | Colin Cross <ccross@android.com> | 2019-04-08 13:00:40 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-04-08 20:04:23 +0000 |
| commit | 09364fd955c38983f8cd05133e9685e2502f0d09 (patch) | |
| tree | 96ebf1c623dc3ef6473ba78b80ae6a5b188ec30f /python | |
| parent | 0975ee0de3d2befefa613754b4dd684a1a9b8c0e (diff) | |
| download | build_soong-09364fd955c38983f8cd05133e9685e2502f0d09.tar.gz build_soong-09364fd955c38983f8cd05133e9685e2502f0d09.tar.bz2 build_soong-09364fd955c38983f8cd05133e9685e2502f0d09.zip | |
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
Diffstat (limited to 'python')
| -rw-r--r-- | python/proto.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/python/proto.go b/python/proto.go index b3ffaa67..85ed1a51 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()) |