commit c8e040c70fcaa9531c4123df6f12dd229c6d4ba0
author Sam Delmerico <delmerico@google.com> Tue Oct 31 17:27:02 2023 +0000
committer Sam Delmerico <delmerico@google.com> Tue Oct 31 18:59:04 2023 +0000
tree 37db4b1ef6675026ebd5de5670baa9ab7c709a17
parent 82f0f7eca194357145d2dc8beb3efa6b7d9c7383

transitive r8 flags for installable {android,java}_libraries

Only android_apps were actually applying transitive proguard flags files
to their r8 invocation. This CL ensures that this also occurs for
installable android_libraries and java_libraries.

Bug: 302342049
Test: go test ./java
Change-Id: Ie94d688d04367ee3d39e7e760fb3003df5829951

java/dex.go

diff --git a/java/dex.go b/java/dex.go
index 9ce5053..aa01783 100644
--- a/java/dex.go
+++ b/java/dex.go
@@ -300,6 +300,8 @@
 
 	flagFiles = append(flagFiles, android.PathsForModuleSrc(ctx, opt.Proguard_flags_files)...)
 
+	flagFiles = android.FirstUniquePaths(flagFiles)
+
 	r8Flags = append(r8Flags, android.JoinWithPrefix(flagFiles.Strings(), "-include "))
 	r8Deps = append(r8Deps, flagFiles...)