diff --git a/Android.bp b/Android.bp index e287dabe7..eb70cc1f3 100644 --- a/Android.bp +++ b/Android.bp @@ -205,11 +205,11 @@ blueprint_go_binary { } blueprint_go_binary { - name: "soong_jar", + name: "soong_zip", deps: ["android-archive-zip"], srcs: [ - "cmd/soong_jar/soong_jar.go", - "cmd/soong_jar/rate_limit.go", + "cmd/soong_zip/soong_zip.go", + "cmd/soong_zip/rate_limit.go", ], } diff --git a/cmd/soong_jar/rate_limit.go b/cmd/soong_zip/rate_limit.go similarity index 100% rename from cmd/soong_jar/rate_limit.go rename to cmd/soong_zip/rate_limit.go diff --git a/cmd/soong_jar/soong_jar.go b/cmd/soong_zip/soong_zip.go similarity index 97% rename from cmd/soong_jar/soong_jar.go rename to cmd/soong_zip/soong_zip.go index bca0dba93..b0f3daaf6 100644 --- a/cmd/soong_jar/soong_jar.go +++ b/cmd/soong_zip/soong_zip.go @@ -77,9 +77,9 @@ func (l *fileArgs) Get() interface{} { } var ( - out = flag.String("o", "", "file to write jar file to") - manifest = flag.String("m", "", "input manifest file name") - directories = flag.Bool("d", false, "include directories in jar") + out = flag.String("o", "", "file to write zip file to") + manifest = flag.String("m", "", "input jar manifest file name") + directories = flag.Bool("d", false, "include directories in zip") relativeRoot = flag.String("C", "", "path to use as relative root of files in next -f or -l argument") parallelJobs = flag.Int("j", runtime.NumCPU(), "number of parallel threads to use") compLevel = flag.Int("L", 5, "deflate compression level (0-9)") @@ -92,11 +92,11 @@ var ( func init() { flag.Var(&listFiles, "l", "file containing list of .class files") - flag.Var(&files, "f", "file to include in jar") + flag.Var(&files, "f", "file to include in zip") } func usage() { - fmt.Fprintf(os.Stderr, "usage: soong_jar -o jarfile [-m manifest] -C dir [-f|-l file]...\n") + fmt.Fprintf(os.Stderr, "usage: soong_zip -o zipfile [-m manifest] -C dir [-f|-l file]...\n") flag.PrintDefaults() os.Exit(2) } diff --git a/java/builder.go b/java/builder.go index d41abc187..f674f9808 100644 --- a/java/builder.go +++ b/java/builder.go @@ -90,7 +90,7 @@ func init() { pctx.Import("github.com/google/blueprint/bootstrap") pctx.StaticVariable("commonJdkFlags", "-source 1.7 -target 1.7 -Xmaxerrs 9999999") pctx.StaticVariable("javacCmd", "javac -J-Xmx1024M $commonJdkFlags") - pctx.StaticVariable("jarCmd", filepath.Join("${bootstrap.ToolDir}", "soong_jar")) + pctx.StaticVariable("jarCmd", filepath.Join("${bootstrap.ToolDir}", "soong_zip")) pctx.HostBinToolVariable("dxCmd", "dx") pctx.HostJavaToolVariable("jarjarCmd", "jarjar.jar") }