commit 71a91f36e333f8b5816522d72e81bce4af74d998
author Colin Cross <ccross@android.com> Thu Sep 21 05:16:56 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 21 05:16:56 2017 +0000
tree 3e4e35fe16b6b5398026a68e17a626d8d2053c0d
parent dcceaa48bb60687b77823eebef166efe1e24e4d1
parent d685385c6baf385c1d87bfa92dcd0f824a2cb09f

Merge "Don't generate dex jars for host modules"
am: d685385c6b

Change-Id: I852fed179313dc80eeaa804948b88c1ffb54e4c7

java/java.go

diff --git a/java/java.go b/java/java.go
index 326d278..43f97ac 100644
--- a/java/java.go
+++ b/java/java.go
@@ -466,7 +466,8 @@
 
 	j.classpathFile = outputFile
 
-	if j.deviceProperties.Dex && len(srcFiles) > 0 {
+	// TODO(ccross): handle hostdex
+	if ctx.Device() && len(srcFiles) > 0 {
 		dxFlags := j.deviceProperties.Dxflags
 		if false /* emma enabled */ {
 			// If you instrument class files that have local variable debug information in