diff options
| author | Colin Cross <ccross@android.com> | 2018-07-12 12:28:41 -0700 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2018-07-12 16:59:59 -0700 |
| commit | 37f6d79c7ea557c117d119a89bb46d7a6a5d19ff (patch) | |
| tree | ad4c52af3781293d6dc968b3be931a94d0f0d441 /java/java_test.go | |
| parent | 7f09c40c4924ac2e8510036bfa6ce264216bc964 (diff) | |
Add exclude_files and exclude_dirs properties to java_import
Prebuilt jars sometime contain files that we don't want. In Make
we would delete everything in META-INF when importing jars, but
that caused problems when there were necessary files in there,
so we added LOCAL_DONT_DELETE_JAR_META_INF.
Soong does the opposite, keeping everything by default. Add
properties to allow explicitly stripping unwanted files instead.
Bug: 111389216
Test: m checkbuild
Change-Id: I6d07f519ebc7d0e1bf0af93416bb569e3c2b1500
Diffstat (limited to 'java/java_test.go')
| -rw-r--r-- | java/java_test.go | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/java/java_test.go b/java/java_test.go index 537bdb923..6bba29b8e 100644 --- a/java/java_test.go +++ b/java/java_test.go @@ -598,14 +598,15 @@ func TestPrebuilts(t *testing.T) { javac := ctx.ModuleForTests("foo", "android_common").Rule("javac") combineJar := ctx.ModuleForTests("foo", "android_common").Description("for javac") + barJar := ctx.ModuleForTests("bar", "android_common").Rule("combineJar").Output + bazJar := ctx.ModuleForTests("baz", "android_common").Rule("combineJar").Output - bar := "a.jar" - if !strings.Contains(javac.Args["classpath"], bar) { - t.Errorf("foo classpath %v does not contain %q", javac.Args["classpath"], bar) + if !strings.Contains(javac.Args["classpath"], barJar.String()) { + t.Errorf("foo classpath %v does not contain %q", javac.Args["classpath"], barJar.String()) } - 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") + if len(combineJar.Inputs) != 2 || combineJar.Inputs[1].String() != bazJar.String() { + t.Errorf("foo combineJar inputs %v does not contain %q", combineJar.Inputs, bazJar.String()) } } |