diff options
| author | 2017-09-12 22:50:46 -0700 | |
|---|---|---|
| committer | 2017-09-20 13:20:45 -0700 | |
| commit | 635acc9446c3a8c88b6599d30312c6399419f2b8 (patch) | |
| tree | f46d048da7c2ac22272bcfb8f792a3db56997b80 /java/java_test.go | |
| parent | 6eebec7414cb5940725c91bc03261c7de838b9e0 (diff) | |
Rearrange manifest file handling in merge_zips and soong_zip
Jar always puts default MANIFEST.MF files in if none was specified.
Copying that behavior in soong_zip causes problems with merge_zips,
because it ends up taking the default manifest from the classes.jar
instead of the user's manifest from res.jar. We don't want the
user's manifest in the classes.jar, otherwise a change to the
manifest will cause all the class files to rebuild. Instead,
move the manifest insertion to the final merge_zips stage.
Test: m -j checkbuild
Change-Id: Id6376961dbaf743c2fb92843f9bdf2e44b963be0
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/java/java_test.go b/java/java_test.go index 4f5c0ecc7..ab5af0a2a 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -119,8 +119,8 @@ func TestSimple(t *testing.T) { t.Errorf(`foo inputs %v != ["a.java"]`, javac.Inputs) } - bar := filepath.Join(buildDir, ".intermediates", "bar", "classes.jar") - baz := filepath.Join(buildDir, ".intermediates", "baz", "classes.jar") + bar := filepath.Join(buildDir, ".intermediates", "bar", "classes-compiled.jar") + baz := filepath.Join(buildDir, ".intermediates", "baz", "classes-compiled.jar") if !strings.Contains(javac.Args["classpath"], bar) { t.Errorf("foo classpath %v does not contain %q", javac.Args["classpath"], bar) @@ -182,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.jar") + deps[i] = filepath.Join(buildDir, ".intermediates", deps[i], "classes-compiled.jar") } dep := strings.Join(deps, ":") @@ -279,12 +279,12 @@ func TestDefaults(t *testing.T) { t.Errorf(`foo inputs %v != ["a.java"]`, javac.Inputs) } - bar := filepath.Join(buildDir, ".intermediates", "bar", "classes.jar") + bar := filepath.Join(buildDir, ".intermediates", "bar", "classes-compiled.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.jar") + baz := filepath.Join(buildDir, ".intermediates", "baz", "classes-compiled.jar") if len(combineJar.Inputs) != 2 || combineJar.Inputs[1].String() != baz { t.Errorf("foo combineJar inputs %v does not contain %q", combineJar.Inputs, baz) } |