Revert "Add filegroup support to notice property."
This reverts commit ff7a1a47d9
.
Reason for revert: Broke ART buildbot
Change-Id: I005ccfcc2c36bbcb274cb2a069fc701168faacd2
This commit is contained in:
@@ -441,7 +441,6 @@ type ModuleBase struct {
|
||||
noAddressSanitizer bool
|
||||
installFiles Paths
|
||||
checkbuildFiles Paths
|
||||
noticeFile Path
|
||||
|
||||
// Used by buildTargetSingleton to create checkbuild and per-directory build targets
|
||||
// Only set on the final variant of each module
|
||||
@@ -790,11 +789,6 @@ func (a *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext)
|
||||
|
||||
a.installFiles = append(a.installFiles, ctx.installFiles...)
|
||||
a.checkbuildFiles = append(a.checkbuildFiles, ctx.checkbuildFiles...)
|
||||
|
||||
if a.commonProperties.Notice != nil {
|
||||
// For filegroup-based notice file references.
|
||||
a.noticeFile = ctx.ExpandSource(*a.commonProperties.Notice, "notice")
|
||||
}
|
||||
}
|
||||
|
||||
if a == ctx.FinalModule().(Module).base() {
|
||||
|
Reference in New Issue
Block a user