commit e0233a5bdd560ad567dc716990ab17c3fe0c5a4f
author Anton Hansson <hansson@google.com> Wed Feb 20 09:13:50 2019 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Feb 20 09:13:50 2019 +0000
tree 680d3565adca6bb9f685fc44e81de74ffe7b4811
parent 4c317f1cbb7c497ebd61e418fcfc37208a33e82c
parent b245abd5a7bcdc6f8771a94afb11562a0cc8d423

Merge "Remove workaround for dupe RRO dirs"

java/aar.go

diff --git a/java/aar.go b/java/aar.go
index b8a5e35..e5ab036 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -190,9 +190,6 @@
 	linkFlags, linkDeps, resDirs, overlayDirs, rroDirs := a.aapt2Flags(ctx, sdkContext, manifestPath)
 
 	rroDirs = append(rroDirs, staticRRODirs...)
-	// TODO(b/124035856): stop de-duping when there are no more dupe resource dirs.
-	rroDirs = android.FirstUniquePaths(rroDirs)
-
 	linkFlags = append(linkFlags, libFlags...)
 	linkDeps = append(linkDeps, libDeps...)
 	linkFlags = append(linkFlags, extraLinkFlags...)