diff --git a/apex/apex.go b/apex/apex.go index 09de2d48a..a2ab99592 100644 --- a/apex/apex.go +++ b/apex/apex.go @@ -455,9 +455,6 @@ type apexBundle struct { // Processed file_contexts files fileContexts android.WritablePath - // Path to notice file in html.gz format. - htmlGzNotice android.WritablePath - // The built APEX file. This is the main product. // Could be .apex or .capex outputFile android.WritablePath @@ -1903,9 +1900,6 @@ func (a *apexBundle) ProcessBazelQueryResponse(ctx android.ModuleContext) { apexType := a.properties.ApexType switch apexType { case imageApex: - - // TODO(b/190817312): Generate the notice file from the apex rule. - a.htmlGzNotice = android.PathForBazelOut(ctx, "NOTICE.html.gz") a.bundleModuleFile = android.PathForBazelOut(ctx, outputs.BundleFile) a.nativeApisUsedByModuleFile = android.ModuleOutPath(android.PathForBazelOut(ctx, outputs.SymbolsUsedByApex)) a.nativeApisBackedByModuleFile = android.ModuleOutPath(android.PathForBazelOut(ctx, outputs.BackingLibs)) diff --git a/apex/builder.go b/apex/builder.go index e4c1673c4..9e368b604 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -650,9 +650,9 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { } // Create a NOTICE file, and embed it as an asset file in the APEX. - a.htmlGzNotice = android.PathForModuleOut(ctx, "NOTICE.html.gz") + htmlGzNotice := android.PathForModuleOut(ctx, "NOTICE.html.gz") android.BuildNoticeHtmlOutputFromLicenseMetadata( - ctx, a.htmlGzNotice, "", "", + ctx, htmlGzNotice, "", "", []string{ android.PathForModuleInstall(ctx).String() + "/", android.PathForModuleInPartitionInstall(ctx, "apex").String() + "/", @@ -660,7 +660,7 @@ func (a *apexBundle) buildUnflattenedApex(ctx android.ModuleContext) { noticeAssetPath := android.PathForModuleOut(ctx, "NOTICE", "NOTICE.html.gz") builder := android.NewRuleBuilder(pctx, ctx) builder.Command().Text("cp"). - Input(a.htmlGzNotice). + Input(htmlGzNotice). Output(noticeAssetPath) builder.Build("notice_dir", "Building notice dir") implicitInputs = append(implicitInputs, noticeAssetPath)