From e302687ea453099e7b61bf7dc585f10ea6ae97eb Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Sat, 5 Jan 2019 22:30:13 -0800
Subject: [PATCH] Don't dexpreopt or strip java_test modules

I6bb2c971cee65d2338839753aa0d84939f335b1b accidentally caused
java_test modules to be dexpreopted and possibly stripped.

Test: dexpreopt_test.go
Change-Id: Ida8f046c509c97e38bd3bce66944d32f01530db4
---
 java/dexpreopt_test.go | 9 +++++++++
 java/java.go           | 1 +
 2 files changed, 10 insertions(+)

diff --git a/java/dexpreopt_test.go b/java/dexpreopt_test.go
index 5b5579983..e4c80ddec 100644
--- a/java/dexpreopt_test.go
+++ b/java/dexpreopt_test.go
@@ -82,6 +82,15 @@ func TestDexpreoptEnabled(t *testing.T) {
 				}`,
 			enabled: false,
 		},
+		{
+			name: "java test",
+			bp: `
+				java_test {
+					name: "foo",
+					srcs: ["a.java"],
+				}`,
+			enabled: false,
+		},
 		{
 			name: "android test",
 			bp: `
diff --git a/java/java.go b/java/java.go
index c02ccd347..12e724e78 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1601,6 +1601,7 @@ func TestFactory() android.Module {
 		&module.testProperties)
 
 	module.Module.properties.Installable = proptools.BoolPtr(true)
+	module.Module.dexpreopter.isTest = true
 
 	InitJavaModule(module, android.HostAndDeviceSupported)
 	return module