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

Commit b245abd5 authored by Anton Hansson's avatar Anton Hansson
Browse files

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
parent 1f9e90a3

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...)