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

Commit 2fc1d0f1 authored by Anton Hansson's avatar Anton Hansson Committed by android-build-merger
Browse files

Workaround dupe resource directories 

am: 129b9cee

Change-Id: I5f685b76f379589f5964fc1c59c2597cfd44d3dc
parents 98b14421 129b9cee

java/aar.go

+2 −0
Original line number Diff line number Diff line
@@ -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...)