From df3f4c81f3a3ae1a5a39cc07cca7fed0d71b51ee Mon Sep 17 00:00:00 2001 From: Colin Cross Date: Tue, 18 Sep 2018 16:31:09 -0700 Subject: [PATCH] soong_zip: move the -j flag to -parallel The -j flag is going to be repurposed to match --junk-paths in zip. Test: m checkbuild Change-Id: Id3809d6e5e3da375531269f2372eefc565091cc2 --- zip/cmd/main.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/zip/cmd/main.go b/zip/cmd/main.go index 60017aa94..5c6199e89 100644 --- a/zip/cmd/main.go +++ b/zip/cmd/main.go @@ -155,11 +155,11 @@ func main() { directories := flags.Bool("d", false, "include directories in zip") rootPrefix = flags.String("P", "", "path prefix within the zip at which to place files") relativeRoot = flags.String("C", "", "path to use as relative root of files in following -f, -l, or -D arguments") - parallelJobs := flags.Int("j", runtime.NumCPU(), "number of parallel threads to use") compLevel := flags.Int("L", 5, "deflate compression level (0-9)") emulateJar := flags.Bool("jar", false, "modify the resultant .zip to emulate the output of 'jar'") writeIfChanged := flags.Bool("write_if_changed", false, "only update resultant .zip if it has changed") + parallelJobs := flags.Int("parallel", runtime.NumCPU(), "number of parallel threads to use") cpuProfile := flags.String("cpuprofile", "", "write cpu profile to file") traceFile := flags.String("trace", "", "write trace to file")