From dc2da916fb1966fe0fb7a559542aa076ba29898c Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Sat, 5 Jan 2019 22:13:05 -0800
Subject: Don't dexpreopt when compile_dex but not installable

Modules shouldn't be dexpreopted and possibly stripped when
compile_dex is set but installable is not set.  This matches the
previous behavior when the dexpreopt rules were in Make.

Bug: 121317615
Test: dexpreopt_test.go
Change-Id: I6f80b7b37a990c475b91aa5d98a19a3baa85eb1b
---
 java/java.go | 1 +
 1 file changed, 1 insertion(+)

(limited to 'java/java.go')

diff --git a/java/java.go b/java/java.go
index 12e724e78..5e67193f0 100644
--- a/java/java.go
+++ b/java/java.go
@@ -1326,6 +1326,7 @@ func (j *Module) compile(ctx android.ModuleContext, extraSrcJars ...android.Path
 
 		j.dexJarFile = dexOutputFile
 
+		j.dexpreopter.isInstallable = Bool(j.properties.Installable)
 		dexOutputFile = j.dexpreopt(ctx, dexOutputFile)
 
 		j.maybeStrippedDexJarFile = dexOutputFile
-- 
cgit v1.2.3-59-g8ed1b