From 0e84935ac4a5d66bd5772a1a42d8e9843240b8c4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Gjesse?= <sgjesse@google.com>
Date: Wed, 22 Aug 2018 16:16:23 +0200
Subject: [PATCH] Ensure that the R8 minification map (ProGuard dictionary)
 file exists

R8 no longer outputs an empty map file when minification
(obfuscation) is turned off.

Test: m -j PRODUCT-aosp_x86-eng
Change-Id: I317e703597368dc8c16751bcc8d0e43f985614fa
---
 java/dex.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/java/dex.go b/java/dex.go
index 77a3644da..054a1766b 100644
--- a/java/dex.go
+++ b/java/dex.go
@@ -39,10 +39,12 @@ var d8 = pctx.AndroidStaticRule("d8",
 var r8 = pctx.AndroidStaticRule("r8",
 	blueprint.RuleParams{
 		Command: `rm -rf "$outDir" && mkdir -p "$outDir" && ` +
+			`rm -f "$outDict" && ` +
 			`${config.R8Cmd} -injars $in --output $outDir ` +
 			`--force-proguard-compatibility ` +
 			`-printmapping $outDict ` +
 			`$dxFlags $r8Flags && ` +
+			`touch "$outDict" && ` +
 			`${config.SoongZipCmd} -o $outDir/classes.dex.jar -C $outDir -D $outDir && ` +
 			`${config.MergeZipsCmd} -D -stripFile "**/*.class" $out $outDir/classes.dex.jar $in`,
 		CommandDeps: []string{