StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove workaround for dupe RRO dirs

Browse Source 
All the apps suffering from the duplicate resource directory
problem have been fixed.

Bug: 124035856
Test: make previously failing products
Change-Id: Iecdcdb3d4dab514d7f620876996d25f199d4bcfe
This commit is contained in:
Anton Hansson
2019-02-19 13:48:28 +00:00
parent 1f9e90a304
commit b245abd5a7
1 changed files with 0 additions and 3 deletions
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) linkFlags, linkDeps, resDirs, overlayDirs, rroDirs := a.aapt2Flags(ctx, sdkContext, manifestPath)
rroDirs = append(rroDirs, staticRRODirs...) 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...) linkFlags = append(linkFlags, libFlags...)
linkDeps = append(linkDeps, libDeps...) linkDeps = append(linkDeps, libDeps...)
linkFlags = append(linkFlags, extraLinkFlags...) linkFlags = append(linkFlags, extraLinkFlags...)