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

Shard aidl compiles into srcjars

Browse Source 
Group aidl files into groups of 50 and compile them together into a
srcjar.

Bug: 124333557
Test: m checkbuild
Change-Id: I18e0858eab434071d3ff0039bb21e07c7311b601
This commit is contained in:
Colin Cross
2019-06-14 18:51:47 -07:00
parent 9516a6c3f2
commit c080617c8b
4 changed files with 95 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
java/sdk_test.go
View File

@@ -250,7 +250,10 @@ func TestClasspath(t *testing.T) {
}
checkClasspath := func(t *testing.T, ctx *android.TestContext) {
javac := ctx.ModuleForTests("foo", variant).Rule("javac")
foo := ctx.ModuleForTests("foo", variant)
javac := foo.Rule("javac")
aidl := foo.MaybeRule("aidl")
got := javac.Args["bootClasspath"]
if got != bc {
@@ -263,6 +266,9 @@ func TestClasspath(t *testing.T) {
}
var deps []string
if aidl.Rule != nil {
deps = append(deps, aidl.Output.String())
}
if len(bootclasspath) > 0 && bootclasspath[0] != `""` {
deps = append(deps, bootclasspath...)
}
@@ -290,12 +296,8 @@ func TestClasspath(t *testing.T) {
if testcase.host != android.Host {
aidl := ctx.ModuleForTests("foo", variant).Rule("aidl")
aidlFlags := aidl.Args["aidlFlags"]
// Trim trailing "-I." to avoid having to specify it in every test
aidlFlags = strings.TrimSpace(strings.TrimSuffix(aidlFlags, "-I."))
if g, w := aidlFlags, testcase.aidl; g != w {
t.Errorf("want aidl flags %q, got %q", w, g)
if g, w := aidl.RuleParams.Command, testcase.aidl+" -I."; !strings.Contains(g, w) {
t.Errorf("want aidl command to contain %q, got %q", w, g)
}
}
})