Unless overridden include LICENSE files in notices.
As a second step to removing the go/android3p instructions to copy or to link NOTICE to LICENSE, include LICENSE files in the notices, which will allow deleting all of the copied/linked NOTICE files. The change causes a few additions to the system image notice files. Test: manually built and compared before and after notices Change-Id: Ia7bc58e2eba7bed5e63934881b5298201a93bc3e
This commit is contained in:
14
java/app.go
14
java/app.go
@@ -390,16 +390,20 @@ func (a *AndroidApp) noticeBuildActions(ctx android.ModuleContext) {
|
||||
return false
|
||||
}
|
||||
|
||||
path := child.(android.Module).NoticeFile()
|
||||
if path.Valid() {
|
||||
noticePathSet[path.Path()] = true
|
||||
paths := child.(android.Module).NoticeFiles()
|
||||
if len(paths) > 0 {
|
||||
for _, path := range paths {
|
||||
noticePathSet[path] = true
|
||||
}
|
||||
}
|
||||
return true
|
||||
})
|
||||
|
||||
// If the app has one, add it too.
|
||||
if a.NoticeFile().Valid() {
|
||||
noticePathSet[a.NoticeFile().Path()] = true
|
||||
if len(a.NoticeFiles()) > 0 {
|
||||
for _, path := range a.NoticeFiles() {
|
||||
noticePathSet[path] = true
|
||||
}
|
||||
}
|
||||
|
||||
if len(noticePathSet) == 0 {
|
||||
|
Reference in New Issue
Block a user