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

Workaround dupe resource directories am: 129b9ceeb1 am: 2fc1d0f1ea

Browse Source 
am: c8fa538ac0

Change-Id: I80de41497623113dd12cf65c41a8148a294109dc
This commit is contained in:
Anton Hansson
2019-02-08 00:14:06 -08:00
committed by android-build-merger
parent 95f416cac8 c8fa538ac0
commit 18b30f9a4c
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/aar.go
View File

@@ -186,6 +186,8 @@ 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...)