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

Fix arch specific properties for java modules

Browse Source 
Arch specific properties were not being applied to modules
with OS set to Common.

Test: java_test.go
Change-Id: I8f1b49ca51b0cf96f78006dfcd121672e581d9c5
This commit is contained in:
Colin Cross
2017-10-02 13:55:26 -07:00
parent a60ead85fc
commit d5934c8bb7
2 changed files with 88 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
java/java_test.go
View File

@@ -139,7 +139,7 @@ func TestSimple(t *testing.T) {
name: "baz",
srcs: ["c.java"],
}
`)
`)
javac := ctx.ModuleForTests("foo", "android_common").Rule("javac")
combineJar := ctx.ModuleForTests("foo", "android_common").Rule("combineJar")
@@ -164,6 +164,25 @@ func TestSimple(t *testing.T) {
}
}
func TestArchSpecific(t *testing.T) {
ctx := testJava(t, `
java_library {
name: "foo",
srcs: ["a.java"],
target: {
android: {
srcs: ["b.java"],
},
},
}
`)
javac := ctx.ModuleForTests("foo", "android_common").Rule("javac")
if len(javac.Inputs) != 2 || javac.Inputs[0].String() != "a.java" || javac.Inputs[1].String() != "b.java" {
t.Errorf(`foo inputs %v != ["a.java", "b.java"]`, javac.Inputs)
}
}
var classpathTestcases = []struct {
name string
host android.OsClass