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

Fix bug: allow multiple gen_notice modules.

Browse Source 
Test: m cts dist reportmissinglicenses

Change-Id: I07963c83eaddfe363a04871e813b56fe7f1465ad
This commit is contained in:
Bob Badour
2022-05-20 16:37:26 -07:00
parent 1811ed3764
commit a5ea2479d3
6 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
java/app.go
View File

@@ -656,7 +656,7 @@ func (a *AndroidApp) generateAndroidBuildActions(ctx android.ModuleContext) {
if Bool(a.appProperties.Embed_notices) || ctx.Config().IsEnvTrue("ALWAYS_EMBED_NOTICES") {
noticeFile := android.PathForModuleOut(ctx, "NOTICE.html.gz")
android.BuildNoticeHtmlOutputFromLicenseMetadata(ctx, noticeFile, "", a.outputFile.String())
android.BuildNoticeHtmlOutputFromLicenseMetadata(ctx, noticeFile, "", "", a.outputFile.String())
noticeAssetPath := android.PathForModuleOut(ctx, "NOTICE", "NOTICE.html.gz")
builder := android.NewRuleBuilder(pctx, ctx)
builder.Command().Text("cp").