From ed19fc3e2cc2164d4dd8aaef2e5e9a61497ef785 Mon Sep 17 00:00:00 2001 From: Nan Zhang Date: Thu, 19 Oct 2017 13:06:22 -0700 Subject: 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 --- java/system_modules.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'java/system_modules.go') 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()...) } }) -- cgit v1.2.3