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

Make javac rules output a jar with soong_zip

Browse Source 
Make javac rules output a jar file instead of a classes.list.
Combine the output jar, static jar dependencies, and resources
into the final jar using a separate rule.  For now, use a shell
command with unzip and soong_zip to create the final jar,
eventually it will be done with a zip2zip-style jar combiner.

Bug: 64691570
Test: java_test.go
Change-Id: Id8e6313e0097b78947d88e86e47b56ad08caca1a
This commit is contained in:
Colin Cross
2017-08-30 14:24:55 -07:00
parent fee57cb33e
commit 0a6e007e06
5 changed files with 112 additions and 176 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
java/java_test.go
View File

@@ -69,6 +69,7 @@ func testJava(t *testing.T, bp string) *android.TestContext {
bp += fmt.Sprintf(`
java_library {
name: "%s",
srcs: ["a.java"],
no_standard_libs: true,
}
`, extra)
@@ -112,20 +113,25 @@ func TestSimple(t *testing.T) {
`)
javac := ctx.ModuleForTests("foo", "").Rule("javac")
jar := ctx.ModuleForTests("foo", "").Rule("jar")
combineJar := ctx.ModuleForTests("foo", "").Rule("combineJar")
if len(javac.Inputs) != 1 || javac.Inputs[0].String() != "a.java" {
t.Errorf(`foo inputs %v != ["a.java"]`, javac.Inputs)
}
bar := filepath.Join(buildDir, ".intermediates", "bar", "classes-full-debug.jar")
bar := filepath.Join(buildDir, ".intermediates", "bar", "classes.jar")
baz := filepath.Join(buildDir, ".intermediates", "baz", "classes.jar")
if !strings.Contains(javac.Args["classpath"], bar) {
t.Errorf("foo classpath %v does not contain %q", javac.Args["classpath"], bar)
}
baz := filepath.Join(buildDir, ".intermediates", "baz", "classes.list")
if !strings.Contains(jar.Args["jarArgs"], baz) {
t.Errorf("foo jarArgs %v does not contain %q", jar.Args["jarArgs"], baz)
if !strings.Contains(javac.Args["classpath"], baz) {
t.Errorf("foo classpath %v does not contain %q", javac.Args["classpath"], baz)
}
if len(combineJar.Inputs) != 2 || combineJar.Inputs[1].String() != baz {
t.Errorf("foo combineJar inputs %v does not contain %q", combineJar.Inputs, baz)
}
}
@@ -176,7 +182,7 @@ func TestSdk(t *testing.T) {
check := func(module string, depType depType, deps ...string) {
for i := range deps {
deps[i] = filepath.Join(buildDir, ".intermediates", deps[i], "classes-full-debug.jar")
deps[i] = filepath.Join(buildDir, ".intermediates", deps[i], "classes.jar")
}
dep := strings.Join(deps, ":")
@@ -229,16 +235,15 @@ func TestPrebuilts(t *testing.T) {
`)
javac := ctx.ModuleForTests("foo", "").Rule("javac")
jar := ctx.ModuleForTests("foo", "").Rule("jar")
combineJar := ctx.ModuleForTests("foo", "").Rule("combineJar")
bar := "a.jar"
if !strings.Contains(javac.Args["classpath"], bar) {
t.Errorf("foo classpath %v does not contain %q", javac.Args["classpath"], bar)
}
baz := filepath.Join(buildDir, ".intermediates", "baz", "extracted0", "classes.list")
if !strings.Contains(jar.Args["jarArgs"], baz) {
t.Errorf("foo jarArgs %v does not contain %q", jar.Args["jarArgs"], baz)
if len(combineJar.Inputs) != 2 || combineJar.Inputs[1].String() != "b.jar" {
t.Errorf("foo combineJar inputs %v does not contain %q", combineJar.Inputs, "b.jar")
}
}
@@ -268,20 +273,20 @@ func TestDefaults(t *testing.T) {
`)
javac := ctx.ModuleForTests("foo", "").Rule("javac")
jar := ctx.ModuleForTests("foo", "").Rule("jar")
combineJar := ctx.ModuleForTests("foo", "").Rule("combineJar")
if len(javac.Inputs) != 1 || javac.Inputs[0].String() != "a.java" {
t.Errorf(`foo inputs %v != ["a.java"]`, javac.Inputs)
}
bar := filepath.Join(buildDir, ".intermediates", "bar", "classes-full-debug.jar")
bar := filepath.Join(buildDir, ".intermediates", "bar", "classes.jar")
if !strings.Contains(javac.Args["classpath"], bar) {
t.Errorf("foo classpath %v does not contain %q", javac.Args["classpath"], bar)
}
baz := filepath.Join(buildDir, ".intermediates", "baz", "classes.list")
if !strings.Contains(jar.Args["jarArgs"], baz) {
t.Errorf("foo jarArgs %v does not contain %q", jar.Args["jarArgs"], baz)
baz := filepath.Join(buildDir, ".intermediates", "baz", "classes.jar")
if len(combineJar.Inputs) != 2 || combineJar.Inputs[1].String() != baz {
t.Errorf("foo combineJar inputs %v does not contain %q", combineJar.Inputs, baz)
}
}