tequilaOS/platform_build_soong
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Remove workaround for dupe RRO dirs"

Browse source
This commit is contained in:
Anton Hansson 2019-02-20 09:13:50 +00:00 committed by Gerrit Code Review
commit e0233a5bdd
1 changed files with 0 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
java/aar.go
View file

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