diff options
| author | Nan Zhang <nanzhang@google.com> | 2017-10-19 13:06:22 -0700 |
|---|---|---|
| committer | Nan Zhang <nanzhang@google.com> | 2017-10-20 16:26:18 -0700 |
| commit | ed19fc3e2cc2164d4dd8aaef2e5e9a61497ef785 (patch) | |
| tree | 25e0fd6f16ac8d92aca7c3d9043a3c877ec576bb /java/system_modules.go | |
| parent | 9e07394fd0c23572365ea1466f6571e01af4df17 (diff) | |
| download | android_build_soong-ed19fc3e2cc2164d4dd8aaef2e5e9a61497ef785.tar.gz android_build_soong-ed19fc3e2cc2164d4dd8aaef2e5e9a61497ef785.tar.bz2 android_build_soong-ed19fc3e2cc2164d4dd8aaef2e5e9a61497ef785.zip | |
Support Turbine in Soong.
If sdk jars(android_stubs_current, etc) are compiled using soong java
modules, we have to filter them when running Java build with Turbine.
TODO: provide more unit-tests.
Test: m clean && m -j32; go test java_test
Change-Id: Iad7c241b0e8b0ca760950733f513124b56c84564
Diffstat (limited to 'java/system_modules.go')
| -rw-r--r-- | java/system_modules.go | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/java/system_modules.go b/java/system_modules.go index ddfc5cfc..ce66a7c1 100644 --- a/java/system_modules.go +++ b/java/system_modules.go @@ -115,7 +115,7 @@ func (system *SystemModules) GenerateAndroidBuildActions(ctx android.ModuleConte ctx.VisitDirectDeps(func(module blueprint.Module) { if ctx.OtherModuleDependencyTag(module) == libTag { dep, _ := module.(Dependency) - jars = append(jars, dep.ClasspathFiles()...) + jars = append(jars, dep.HeaderJars()...) } }) |