Revert "Build notice files from license metadata."

This reverts commit 43c2dcaef6.

Reason for revert: suspect build break

Bug: 227682036

Test: TARGET_BUILD_VARIANT=userdebug UNBUNDLED_BUILD_SDKS_FROM_SOURCE=true vendor/google/build/mainline_modules_bundles.sh -j97


Change-Id: Ibfb8b4fefc264f52f32ba661c269a9cd625d800a
This commit is contained in:
Wei Sheng Shih
2022-04-01 02:05:36 +00:00
committed by Bob Badour
parent 2a5c090c31
commit 77807b3c27
10 changed files with 638 additions and 28 deletions

View File

@@ -414,8 +414,8 @@ type apexBundle struct {
// Processed file_contexts files
fileContexts android.WritablePath
// Path to notice file in html.gz format.
htmlGzNotice android.WritablePath
// Struct holding the merged notice file paths in different formats
mergedNotices android.NoticeOutputs
// The built APEX file. This is the main product.
// Could be .apex or .capex
@@ -487,10 +487,11 @@ const (
// for each of the files in case when the APEX is flattened.
type apexFile struct {
// buildFile is put in the installDir inside the APEX.
builtFile android.Path
installDir string
customStem string
symlinks []string // additional symlinks
builtFile android.Path
noticeFiles android.Paths
installDir string
customStem string
symlinks []string // additional symlinks
// Info for Android.mk Module name of `module` in AndroidMk. Note the generated AndroidMk
// module for apexFile is named something like <AndroidMk module name>.<apex name>[<apex
@@ -527,6 +528,7 @@ func newApexFile(ctx android.BaseModuleContext, builtFile android.Path, androidM
module: module,
}
if module != nil {
ret.noticeFiles = module.NoticeFiles()
ret.moduleDir = ctx.OtherModuleDir(module)
ret.requiredModuleNames = module.RequiredModuleNames()
ret.targetRequiredModuleNames = module.TargetRequiredModuleNames()