diff options
| author | 2023-11-01 15:29:11 +0000 | |
|---|---|---|
| committer | 2023-11-01 15:29:11 +0000 | |
| commit | d9569528bd7d45bce9555d96393cded55dfa3dc0 (patch) | |
| tree | a7036b5ca40f8dd0330c88354492d782a46c981e /java/dex.go | |
| parent | 78a658b81f007d0c8774656504f55e589a9199d6 (diff) | |
| parent | c8e040c70fcaa9531c4123df6f12dd229c6d4ba0 (diff) | |
Merge "transitive r8 flags for installable {android,java}_libraries" into main
Diffstat (limited to 'java/dex.go')
| -rw-r--r-- | java/dex.go | 2 |
1 files changed, 2 insertions, 0 deletions
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...) |