| commit | bce06b6840c1717b2c63ef7de4f6412b6ba1614c | [log] [tgz] |
|---|---|---|
| author | Treehugger Robot <treehugger-gerrit@google.com> | Tue Feb 19 18:38:11 2019 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Tue Feb 19 18:38:11 2019 +0000 |
| tree | f972d53e4c8565ec87128acb24c7dc2c8048efe7 | |
| parent | 4f41bc2bed906b3baf973ffcdcf3f7f0cb987a1d [diff] | |
| parent | d3cf4ee87b0bd8bacaf86777fa17f4d38942733b [diff] |
Merge "soong_zip after dex should not fail when no *.dex files were generated"
diff --git a/java/dex.go b/java/dex.go index 913eee6..54b7bfc 100644 --- a/java/dex.go +++ b/java/dex.go
@@ -177,9 +177,9 @@ javalibJar := android.PathForModuleOut(ctx, "dex", jarName) outDir := android.PathForModuleOut(ctx, "dex") - zipFlags := "" + zipFlags := "--ignore_missing_files" if j.deviceProperties.UncompressDex { - zipFlags = "-L 0" + zipFlags += " -L 0" } if useR8 {