aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2019-02-19 18:38:11 +0000
committerGerrit Code Review <noreply-gerritcodereview@google.com>2019-02-19 18:38:11 +0000
commitbce06b6840c1717b2c63ef7de4f6412b6ba1614c (patch)
treef972d53e4c8565ec87128acb24c7dc2c8048efe7
parent4f41bc2bed906b3baf973ffcdcf3f7f0cb987a1d (diff)
parentd3cf4ee87b0bd8bacaf86777fa17f4d38942733b (diff)
downloadbuild_soong-bce06b6840c1717b2c63ef7de4f6412b6ba1614c.tar.gz
build_soong-bce06b6840c1717b2c63ef7de4f6412b6ba1614c.tar.bz2
build_soong-bce06b6840c1717b2c63ef7de4f6412b6ba1614c.zip
Merge "soong_zip after dex should not fail when no *.dex files were generated"
-rw-r--r--java/dex.go4
1 files changed, 2 insertions, 2 deletions
diff --git a/java/dex.go b/java/dex.go
index 913eee6a..54b7bfcf 100644
--- a/java/dex.go
+++ b/java/dex.go
@@ -177,9 +177,9 @@ func (j *Module) compileDex(ctx android.ModuleContext, flags javaBuilderFlags,
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 {