Remove workaround for dupe RRO dirs
All the apps suffering from the duplicate resource directory
problem have been fixed.
Bug: 124035856
Test: make previously failing products
Change-Id: Iecdcdb3d4dab514d7f620876996d25f199d4bcfe
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...)