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

Rename soong_jar to soong_zip

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

Change-Id: I05f4654d4517c245ad7a3c15492e0d2368bbf64f
This commit is contained in:
Dan Willemsen
2016-08-10 16:12:30 -07:00
parent 017d8937fa
commit 47ec28f3b1
4 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Android.bp
View File

@@ -205,11 +205,11 @@ blueprint_go_binary {
} }
blueprint_go_binary { blueprint_go_binary {
name: "soong_jar", name: "soong_zip",
deps: ["android-archive-zip"], deps: ["android-archive-zip"],
srcs: [ srcs: [
"cmd/soong_jar/soong_jar.go", "cmd/soong_zip/soong_zip.go",
"cmd/soong_jar/rate_limit.go", "cmd/soong_zip/rate_limit.go",
], ],
} }

0
cmd/soong_jar/rate_limit.go → cmd/soong_zip/rate_limit.go
View File

10
cmd/soong_jar/soong_jar.go → cmd/soong_zip/soong_zip.go
View File

@@ -77,9 +77,9 @@ func (l *fileArgs) Get() interface{} {
} }
var ( var (
out = flag.String("o", "", "file to write jar file to") out = flag.String("o", "", "file to write zip file to")
manifest = flag.String("m", "", "input manifest file name") manifest = flag.String("m", "", "input jar manifest file name")
directories = flag.Bool("d", false, "include directories in jar") 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") 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") parallelJobs = flag.Int("j", runtime.NumCPU(), "number of parallel threads to use")
compLevel = flag.Int("L", 5, "deflate compression level (0-9)") compLevel = flag.Int("L", 5, "deflate compression level (0-9)")
@@ -92,11 +92,11 @@ var (
func init() { func init() {
flag.Var(&listFiles, "l", "file containing list of .class files") 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() { 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() flag.PrintDefaults()
os.Exit(2) os.Exit(2)
} }

2
java/builder.go
View File

@@ -90,7 +90,7 @@ func init() {
pctx.Import("github.com/google/blueprint/bootstrap") pctx.Import("github.com/google/blueprint/bootstrap")
pctx.StaticVariable("commonJdkFlags", "-source 1.7 -target 1.7 -Xmaxerrs 9999999") pctx.StaticVariable("commonJdkFlags", "-source 1.7 -target 1.7 -Xmaxerrs 9999999")
pctx.StaticVariable("javacCmd", "javac -J-Xmx1024M $commonJdkFlags") 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.HostBinToolVariable("dxCmd", "dx")
pctx.HostJavaToolVariable("jarjarCmd", "jarjar.jar") pctx.HostJavaToolVariable("jarjarCmd", "jarjar.jar")
} }