diff options
Diffstat (limited to 'apex/apex.go')
| -rw-r--r-- | apex/apex.go | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/apex/apex.go b/apex/apex.go index 72403f9ba..04808c13b 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,14 +1900,12 @@ 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)) // TODO(b/239084755): Generate the java api using.xml file from Bazel. a.javaApisUsedByModuleFile = android.ModuleOutPath(android.PathForBazelOut(ctx, outputs.JavaSymbolsUsedByApex)) + a.installedFilesFile = android.ModuleOutPath(android.PathForBazelOut(ctx, outputs.InstalledFiles)) installSuffix := imageApexSuffix if a.isCompressed { installSuffix = imageCapexSuffix @@ -2507,7 +2502,8 @@ func apexBootclasspathFragmentFiles(ctx android.ModuleContext, module blueprint. filesToAdd = append(filesToAdd, *af) } - if pathInApex := bootclasspathFragmentInfo.ProfileInstallPathInApex(); pathInApex != "" { + pathInApex := bootclasspathFragmentInfo.ProfileInstallPathInApex() + if pathInApex != "" && !java.SkipDexpreoptBootJars(ctx) { pathOnHost := bootclasspathFragmentInfo.ProfilePathOnHost() tempPath := android.PathForModuleOut(ctx, "boot_image_profile", pathInApex) |