From d3cf4ee87b0bd8bacaf86777fa17f4d38942733b Mon Sep 17 00:00:00 2001
From: Sasha Smundak <asmundak@google.com>
Date: Fri, 15 Feb 2019 10:14:23 -0800
Subject: [PATCH] soong_zip after dex should not fail when no *.dex files were
 generated

This can happen if Android application has only a manifest file and no
java code.

Fixes: 124483155
Test: treehugger with Android.mk converted to Android.bp in
platforms/frameworks/base/tests/privapp-permnissions

Change-Id: I45f95680b62a7a4bda0e7ab156f3df24b0dad70b
---
 java/dex.go | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/java/dex.go b/java/dex.go
index 913eee6ad..54b7bfcfb 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 {