StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix python proto srczip argument order

Browse Source 
-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
This commit is contained in:
Colin Cross
2019-04-08 13:00:40 -07:00
parent 0975ee0de3
commit 09364fd955
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
python/proto.go
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())