diff options
| author | Colin Cross <ccross@android.com> | 2019-01-09 05:43:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2019-01-09 05:43:12 +0000 |
| commit | 1f8076b42dfd99d01b720c027bafd7f671b1d12a (patch) | |
| tree | 9bdcb22c642d8239e450bd322333b5967a0f2f16 /java/java.go | |
| parent | 9036e2eef1919ce6985f534e7988f138ea45ec95 (diff) | |
| parent | dc2da916fb1966fe0fb7a559542aa076ba29898c (diff) | |
Merge changes I6f80b7b3,Ida8f046c
* changes:
Don't dexpreopt when compile_dex but not installable
Don't dexpreopt or strip java_test modules
Diffstat (limited to 'java/java.go')
| -rw-r--r-- | java/java.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/java/java.go b/java/java.go index c02ccd347..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 @@ -1601,6 +1602,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 |