commit 09664bd9a509bfd5e97d3480855533547a4e1d52
author Treehugger Robot <treehugger-gerrit@google.com> Fri Aug 24 22:40:32 2018 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Aug 24 22:40:32 2018 +0000
tree 23b96e6fff9975dc44ebdbdeda22ad7024af2605
parent 21aac6b64b544f690d1b6fa9d1591ccaf29eac54
parent b1c9d40b6f41fd65b84e68ada0334b9c49cdff86

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

cc/ndk_sysroot.go

diff --git a/cc/ndk_sysroot.go b/cc/ndk_sysroot.go
index 144fc09..80b5c6a 100644
--- a/cc/ndk_sysroot.go
+++ b/cc/ndk_sysroot.go
@@ -132,6 +132,10 @@
 		}
 	})
 
+	// 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")
 	ctx.Build(pctx, android.BuildParams{
 		Rule:        android.Cat,