From 4ab5b02e6209e90d661b24fce6ee3a025b12011c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?S=C3=B8ren=20Gjesse?= <sgjesse@google.com>
Date: Wed, 25 Oct 2017 17:10:59 +0200
Subject: [PATCH] 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 | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/core/java.mk b/core/java.mk
index aa6331b2dd..57e396b9fb 100644
--- a/core/java.mk
+++ b/core/java.mk
@@ -719,7 +719,11 @@ endif
 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.