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

Merge "NDK sysroot: include each license file only once"

Browse Source
This commit is contained in:
Treehugger Robot
2018-08-24 22:40:32 +00:00
committed by Gerrit Code Review
parent 21aac6b64b b1c9d40b6f
commit 09664bd9a5
1 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cc/ndk_sysroot.go
View File

@@ -132,6 +132,10 @@ func (n *ndkSingleton) GenerateBuildActions(ctx android.SingletonContext) {
} }
}) })
// Include only a single copy of each license file. The Bionic NOTICE is
// long and is referenced by multiple Bionic modules.
licensePaths = android.FirstUniquePaths(licensePaths)
combinedLicense := getNdkInstallBase(ctx).Join(ctx, "NOTICE") combinedLicense := getNdkInstallBase(ctx).Join(ctx, "NOTICE")
ctx.Build(pctx, android.BuildParams{ ctx.Build(pctx, android.BuildParams{
Rule: android.Cat, Rule: android.Cat,