From a713a6f6bd02435f3d6bdaf8b4cadc8c10945535 Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Wed, 20 Sep 2017 18:04:44 -0700
Subject: [PATCH] Don't generate dex jars for host modules

Hostdex support isn't working yet, and we are accidentally producing
a dex jar for host modules, which confuses soong_java_prebuilt.mk.

Test: m -j checkbuild
Change-Id: Ie2c331fa697f49dab23c380a5c6e0490d67c9f74
---
 java/java.go | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/java/java.go b/java/java.go
index 326d278c7..43f97acda 100644
--- a/java/java.go
+++ b/java/java.go
@@ -466,7 +466,8 @@ func (j *Module) compile(ctx android.ModuleContext) {
 
 	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