commit bd1cef56181f3d5a7f60144fe770b11fed6114ed
author Colin Cross <ccross@android.com> Mon Aug 13 10:28:18 2018 -0700
committer Colin Cross <ccross@android.com> Mon Aug 13 17:29:58 2018 +0000
tree 3ef5993e341a45e0c3d4264714995ea8e908798e
parent 0c3b508d2b8135accc2662a0601bc44f821b60da

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

diff --git a/java/dex.go b/java/dex.go
index db240fc..8363a7d 100644
--- a/java/dex.go
+++ b/java/dex.go
@@ -111,6 +111,8 @@
 	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...)