commit b22934382f46381b1255c01b0658adeb353f22cf
author Søren Gjesse <sgjesse@google.com> Thu Aug 23 11:17:17 2018 +0200
committer Søren Gjesse <sgjesse@google.com> Mon Aug 27 11:19:35 2018 +0200
tree 8cd76bf8c7636b36165674ad04961d2e04316ac9
parent ebe17177fee2fdcf7387d51b95eec56cc99dff38

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: I3bd3f2900225dca05a972f46a3b882041e17ba49

core/definitions.mk

diff --git a/core/definitions.mk b/core/definitions.mk
index d36e7f0..e45cb01 100644
--- a/core/definitions.mk
+++ b/core/definitions.mk
@@ -2915,12 +2915,14 @@
 ###########################################################
 define transform-jar-to-dex-r8
 @echo R8: $@
+$(hide) rm -f $(PRIVATE_PROGUARD_DICTIONARY)
 $(hide) $(R8_COMPAT_PROGUARD) -injars '$<' \
     --min-api $(PRIVATE_MIN_SDK_VERSION) \
     --force-proguard-compatibility --output $(subst classes.dex,,$@) \
     $(PRIVATE_PROGUARD_FLAGS) \
     $(addprefix -injars , $(PRIVATE_EXTRA_INPUT_JAR)) \
     $(PRIVATE_DX_FLAGS)
+$(hide) touch $(PRIVATE_PROGUARD_DICTIONARY)
 endef
 
 ###########################################################