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

am: 212e052aa7

Change-Id: Iaca818cb8f2a7ec6bb5ed231a80e1c054fcd93f6
This commit is contained in:
Sasha Smundak
2019-02-19 10:54:16 -08:00
committed by android-build-merger

View File

@@ -177,9 +177,9 @@ func (j *Module) compileDex(ctx android.ModuleContext, flags javaBuilderFlags,
javalibJar := android.PathForModuleOut(ctx, "dex", jarName) javalibJar := android.PathForModuleOut(ctx, "dex", jarName)
outDir := android.PathForModuleOut(ctx, "dex") outDir := android.PathForModuleOut(ctx, "dex")
zipFlags := "" zipFlags := "--ignore_missing_files"
if j.deviceProperties.UncompressDex { if j.deviceProperties.UncompressDex {
zipFlags = "-L 0" zipFlags += " -L 0"
} }
if useR8 { if useR8 {