summaryrefslogtreecommitdiff
path: root/java/androidmk.go
diff options
context:
space:
mode:
author Colin Cross <ccross@android.com> 2023-07-14 16:10:31 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 2023-07-14 16:10:31 +0000
commit0a30ce7c4b08176b00d308c9a6a5863f28bb914c (patch)
tree959a69f7fa25eaddb3d356bebd15a24b937841e3 /java/androidmk.go
parent59276876cdf458924df66a1eed243d96a12f9f3f (diff)
parentd8c711f884ab622a7838764e6a59f9377770a3f1 (diff)
Merge "Revert "Use depsets for transitive manifests and assets"" into main
Diffstat (limited to 'java/androidmk.go')
-rw-r--r--java/androidmk.go7
1 files changed, 1 insertions, 6 deletions
diff --git a/java/androidmk.go b/java/androidmk.go
index 13cc96a88..9c21633fb 100644
--- a/java/androidmk.go
+++ b/java/androidmk.go
@@ -368,13 +368,8 @@ func (app *AndroidApp) AndroidMkEntries() []android.AndroidMkEntries {
filterRRO := func(filter overlayType) android.Paths {
var paths android.Paths
- seen := make(map[android.Path]bool)
- for _, d := range app.rroDirsDepSet.ToList() {
+ for _, d := range app.rroDirs {
if d.overlayType == filter {
- if seen[d.path] {
- continue
- }
- seen[d.path] = true
paths = append(paths, d.path)
}
}