Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e0233a5b authored by Anton Hansson's avatar Anton Hansson Committed by Gerrit Code Review
Browse files

Merge "Remove workaround for dupe RRO dirs"

parents 4c317f1c b245abd5

java/aar.go

+0 −3
Original line number Diff line number Diff line
@@ -190,9 +190,6 @@ 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...)

	linkFlags = append(linkFlags, extraLinkFlags...)