commit ed19fc3e2cc2164d4dd8aaef2e5e9a61497ef785
author Nan Zhang <nanzhang@google.com> Thu Oct 19 13:06:22 2017 -0700
committer Nan Zhang <nanzhang@google.com> Fri Oct 20 16:26:18 2017 -0700
tree 25e0fd6f16ac8d92aca7c3d9043a3c877ec576bb
parent 9e07394fd0c23572365ea1466f6571e01af4df17

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/config/config.go

diff --git a/java/config/config.go b/java/config/config.go
index f4abd37..6509d80 100644
--- a/java/config/config.go
+++ b/java/config/config.go
@@ -73,6 +73,7 @@
 	pctx.SourcePathVariable("JlinkCmd", "${JavaToolchain}/jlink")
 	pctx.SourcePathVariable("JmodCmd", "${JavaToolchain}/jmod")
 	pctx.SourcePathVariable("JrtFsJar", "${JavaHome}/lib/jrt-fs.jar")
+	pctx.SourcePathVariable("Ziptime", "prebuilts/build-tools/${hostPrebuiltTag}/bin/ziptime")
 
 	pctx.SourcePathVariable("JarArgsCmd", "build/soong/scripts/jar-args.sh")
 	pctx.HostBinToolVariable("SoongZipCmd", "soong_zip")
@@ -95,6 +96,7 @@
 
 	pctx.HostJavaToolVariable("JarjarCmd", "jarjar.jar")
 	pctx.HostJavaToolVariable("DesugarJar", "desugar.jar")
+	pctx.HostJavaToolVariable("TurbineJar", "turbine.jar")
 
 	pctx.HostBinToolVariable("SoongJavacWrapper", "soong_javac_wrapper")