Add filegroup support to notice property.
Also, replace all notice file references with the parent directory pattern(../) with filegroups. Bug: 118899640 Test: Manual build Change-Id: I841345d747f41a3bb5beea66ad87a979734c39a4
This commit is contained in:
@@ -277,8 +277,8 @@ func translateAndroidModule(ctx SingletonContext, w io.Writer, mod blueprint.Mod
|
||||
}
|
||||
}
|
||||
|
||||
if amod.commonProperties.Notice != nil {
|
||||
fmt.Fprintln(&data.preamble, "LOCAL_NOTICE_FILE :=", "$(LOCAL_PATH)/"+*amod.commonProperties.Notice)
|
||||
if amod.noticeFile != nil {
|
||||
fmt.Fprintln(&data.preamble, "LOCAL_NOTICE_FILE :=", amod.noticeFile.String())
|
||||
}
|
||||
|
||||
if host {
|
||||
|
||||
@@ -441,6 +441,7 @@ 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
|
||||
@@ -789,6 +790,11 @@ 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() {
|
||||
|
||||
@@ -207,6 +207,11 @@ func (mutator *mutator) Parallel() MutatorHandle {
|
||||
func depsMutator(ctx BottomUpMutatorContext) {
|
||||
if m, ok := ctx.Module().(Module); ok && m.Enabled() {
|
||||
m.DepsMutator(ctx)
|
||||
|
||||
// For filegroup-based notice file references.
|
||||
if m.base().commonProperties.Notice != nil {
|
||||
ExtractSourceDeps(ctx, m.base().commonProperties.Notice)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user