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

Make htmlGzNotice an internal variable instead of apexBundle field.

Browse Source 
It's not read outside of the function / action generation logic, so keep
it inside the function.

Test: presubmits
Fixes: 190817312
Change-Id: I0626e6c86adc584abb2a251cbc7ffb1bec2c7f59
This commit is contained in:
Jingwen Chen
2022-11-16 19:12:35 +00:00
parent bf29be8f19
commit 4a9630b4ad
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
apex/apex.go
View File

@@ -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))