From c8e040c70fcaa9531c4123df6f12dd229c6d4ba0 Mon Sep 17 00:00:00 2001
From: Sam Delmerico <delmerico@google.com>
Date: Tue, 31 Oct 2023 17:27:02 +0000
Subject: 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 | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'java/dex.go')

diff --git a/java/dex.go b/java/dex.go
index 9ce5053fd..aa017834d 100644
--- a/java/dex.go
+++ b/java/dex.go
@@ -300,6 +300,8 @@ func (d *dexer) r8Flags(ctx android.ModuleContext, flags javaBuilderFlags) (r8Fl
 
 	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...)
 
-- 
cgit v1.2.3-59-g8ed1b