summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--java/aar.go2
1 files changed, 2 insertions, 0 deletions
diff --git a/java/aar.go b/java/aar.go
index 0d38e9f85..fcdd518b4 100644
--- a/java/aar.go
+++ b/java/aar.go
@@ -186,6 +186,8 @@ func (a *aapt) buildActions(ctx android.ModuleContext, sdkContext sdkContext, ex
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...)