StrixOS/build_soong
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Keep Notice property from erasing license texts.

Browse Source 
Remove "default to file in directory". Use explicit applicable license.

Bug: 192434786
Bug: 240342946

Test: m droid dist

Change-Id: Id3d845b2073f151a8c0bad874e7ab005771bdfcb
Merged-in: Id3d845b2073f151a8c0bad874e7ab005771bdfcb
This commit is contained in:
Bob Badour
2022-07-14 10:38:27 -07:00
parent c2b6dec6d1
commit c4d437c6bf
2 changed files with 1 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
android/androidmk.go
View File

@@ -605,7 +605,7 @@ func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint
} }
if len(base.noticeFiles) > 0 { if len(base.noticeFiles) > 0 {
a.SetString("LOCAL_NOTICE_FILE", strings.Join(base.noticeFiles.Strings(), " ")) a.AddStrings("LOCAL_NOTICE_FILE", strings.Join(base.noticeFiles.Strings(), " "))
} }
if host { if host {

8
android/module.go
View File

@@ -2260,14 +2260,6 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext)
} }
if optPath.Valid() { if optPath.Valid() {
m.noticeFiles = append(m.noticeFiles, optPath.Path()) m.noticeFiles = append(m.noticeFiles, optPath.Path())
} else {
for _, notice = range []string{"LICENSE", "LICENCE", "NOTICE"} {
noticePath := filepath.Join(ctx.ModuleDir(), notice)
optPath = ExistentPathForSource(ctx, noticePath)
if optPath.Valid() {
m.noticeFiles = append(m.noticeFiles, optPath.Path())
}
}
} }
licensesPropertyFlattener(ctx) licensesPropertyFlattener(ctx)