diff options
| author | Colin Cross <ccross@android.com> | 2019-01-05 22:13:05 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2019-01-06 08:50:36 -0800 |
| commit | dc2da916fb1966fe0fb7a559542aa076ba29898c (patch) | |
| tree | ecd54616b2a897247d952be516801d1ba02e5418 /java/java.go | |
| parent | e302687ea453099e7b61bf7dc585f10ea6ae97eb (diff) | |
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
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 1 |
1 files changed, 1 insertions, 0 deletions
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 |