commit 4ab5b02e6209e90d661b24fce6ee3a025b12011c
author Søren Gjesse <sgjesse@google.com> Wed Oct 25 17:10:59 2017 +0200
committer Søren Gjesse <sgjesse@google.com> Wed Oct 25 17:16:53 2017 +0200
tree a3189befdcc2c3bf3688abe98ab14246900da7ac
parent 44e5fad30fdd6cd68251895def8ec30c0232e819

Define proguard dictionary output for R8

When running with R8 instead of Proguard + dx the proguard mapping is
produced together with the dex output.

Bug: 68249935
Test: m -j ahat-test
Change-Id: Ica5ef455eb3bd1eabe55c43e9e026f47cadace1c

core/java.mk

diff --git a/core/java.mk b/core/java.mk
index aa6331b..57e396b 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -719,7 +719,11 @@
 endif
 
 ifneq ($(filter obfuscation,$(LOCAL_PROGUARD_ENABLED)),)
+ifneq ($(USE_R8),true)
   $(full_classes_proguard_jar): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary)
+else
+  $(built_dex_intermediate): .KATI_IMPLICIT_OUTPUTS := $(proguard_dictionary)
+endif
 endif
 
 # If R8 is not enabled run Proguard.