Merge "soong_zip after dex should not fail when no *.dex files were generated"

am: bce06b6840 Change-Id: I3bdbac99f9293be32dc31dbec9d83a652aa4586e
2019-02-19 10:49:14 -08:00 · 2019-02-19 10:49:14 -08:00 · 212e052aa7
parent 39cfd70a05 bce06b6840
commit 212e052aa7
1 changed files with 2 additions and 2 deletions
--- 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 {