diff options
| author | 2020-02-18 20:21:55 -0800 | |
|---|---|---|
| committer | 2020-02-21 20:40:43 +0000 | |
| commit | a75b057e17b89c1db8cdf3f8ec1a9dd42b82bd56 (patch) | |
| tree | 6e33e8090b1311b8888fa5f6ad7c1557ef148100 /cc/snapshot_utils.go | |
| parent | 004d7171583722df1d3e647e7ca97be733acee8b (diff) | |
Unless overridden include LICENSE files in notices.
As a second step to removing the go/android3p instructions to copy or
to link NOTICE to LICENSE, include LICENSE files in the notices, which
will allow deleting all of the copied/linked NOTICE files.
The change causes a few additions to the system image notice files.
Test: manually built and compared before and after notices
Change-Id: Ia7bc58e2eba7bed5e63934881b5298201a93bc3e
Diffstat (limited to 'cc/snapshot_utils.go')
| -rw-r--r-- | cc/snapshot_utils.go | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/cc/snapshot_utils.go b/cc/snapshot_utils.go index 8f48f869b..73388ceb6 100644 --- a/cc/snapshot_utils.go +++ b/cc/snapshot_utils.go @@ -117,6 +117,17 @@ func copyFile(ctx android.SingletonContext, path android.Path, out string) andro return outPath } +func combineNotices(ctx android.SingletonContext, paths android.Paths, out string) android.OutputPath { + outPath := android.PathForOutput(ctx, out) + ctx.Build(pctx, android.BuildParams{ + Rule: android.Cat, + Inputs: paths, + Output: outPath, + Description: "combine notices for " + out, + }) + return outPath +} + func writeStringToFile(ctx android.SingletonContext, content, out string) android.OutputPath { outPath := android.PathForOutput(ctx, out) ctx.Build(pctx, android.BuildParams{ |