From bd1cef56181f3d5a7f60144fe770b11fed6114ed Mon Sep 17 00:00:00 2001
From: Colin Cross <ccross@android.com>
Date: Mon, 13 Aug 2018 10:28:18 -0700
Subject: [PATCH] Add proguard_flags_files to r8 command line

We were not passing the proguard_flags_files files as -include
arguments to R8.

Bug: 112462307
Test: m checkbuild
Change-Id: I8f3b10fc338aa4b15c0fb220ee2891efbb0b020f
---
 java/dex.go | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/java/dex.go b/java/dex.go
index db240fc53..8363a7dbb 100644
--- a/java/dex.go
+++ b/java/dex.go
@@ -111,6 +111,8 @@ func (j *Module) r8Flags(ctx android.ModuleContext, flags javaBuilderFlags) (r8F
 	flagFiles = append(flagFiles, j.extraProguardFlagFiles...)
 	// TODO(ccross): static android library proguard files
 
+	flagFiles = append(flagFiles, android.PathsForModuleSrc(ctx, j.deviceProperties.Optimize.Proguard_flags_files)...)
+
 	r8Flags = append(r8Flags, android.JoinWithPrefix(flagFiles.Strings(), "-include "))
 	r8Deps = append(r8Deps, flagFiles...)