diff options
Diffstat (limited to 'apex/builder.go')
| -rw-r--r-- | apex/builder.go | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/apex/builder.go b/apex/builder.go index 67bc20603..5a2134a05 100644 --- a/apex/builder.go +++ b/apex/builder.go @@ -230,12 +230,16 @@ func (a *apexBundle) buildManifest(ctx android.ModuleContext, provideNativeLibs, func (a *apexBundle) buildNoticeFiles(ctx android.ModuleContext, apexFileName string) android.NoticeOutputs { var noticeFiles android.Paths - a.walkPayloadDeps(ctx, func(ctx android.ModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) { + a.walkPayloadDeps(ctx, func(ctx android.ModuleContext, from blueprint.Module, to android.ApexModule, externalDep bool) bool { if externalDep { - return + // As soon as the dependency graph crosses the APEX boundary, don't go further. + return false } + notices := to.NoticeFiles() noticeFiles = append(noticeFiles, notices...) + + return true }) if len(noticeFiles) == 0 { |