openkylin
/
platform_build_soong
mirror of https://gitee.com/openkylin/platform_build_soong.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "Remove workaround for dupe RRO dirs" am: e0233a5bdd am: 24a4d16048 

am: b54ca61c11

Change-Id: Idcab2325dc5a35b709c08d3d0b88e44fdbe59bf2
This commit is contained in:
Anton Hansson 2019-02-20 01:26:19 -08:00 committed by android-build-merger
parent 94330f7d5a b54ca61c11
commit 30b30b9bd0
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...)