commit 47ec28f3b131d29c5ec5da3432c1a8ad51b15fb8
author Dan Willemsen <dwillemsen@google.com> Wed Aug 10 16:12:30 2016 -0700
committer Dan Willemsen <dwillemsen@google.com> Thu Aug 11 01:30:16 2016 -0700
tree 293a33c54d86a2e322cb96734a52fe53fa446651
parent 017d8937fa4536eafa306e99bf83c01d9f3d263e

Rename soong_jar to soong_zip

This is a general purpose tool that happens to contain some jar specific
features.

Change-Id: I05f4654d4517c245ad7a3c15492e0d2368bbf64f

Android.bp

diff --git a/Android.bp b/Android.bp
index e287dab..eb70cc1 100644
--- a/Android.bp
+++ b/Android.bp
@@ -205,11 +205,11 @@
 }
 
 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",
     ],
 }
 

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

cmd/soong_zip/soong_zip.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 bca0dba..b0f3daa 100644
--- a/cmd/soong_jar/soong_jar.go
+++ b/cmd/soong_zip/soong_zip.go
@@ -77,9 +77,9 @@
 }
 
 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 @@
 
 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)
 }

java/builder.go

diff --git a/java/builder.go b/java/builder.go
index d41abc1..f674f98 100644
--- a/java/builder.go
+++ b/java/builder.go
@@ -90,7 +90,7 @@
 	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")
 }