commit 7e3f8508bd6a9e4fabc163236d3d505f822be00a
author Colin Cross <ccross@android.com> Thu Sep 21 05:26:28 2017 +0000
committer android-build-merger <android-build-merger@google.com> Thu Sep 21 05:26:28 2017 +0000
tree 3e4e35fe16b6b5398026a68e17a626d8d2053c0d
parent 4045af1478603c5c87265c58da954207c96b0eb6
parent f4c07c1cb3350556e546a7694014e83528ff0f9a

Merge "Don't generate dex jars for host modules" am: d685385c6b am: 71a91f36e3 am: f8da801672
am: f4c07c1cb3

Change-Id: I902434d9be6d39bc299042dea3acc64252dccfdd

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