Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 9f847581 authored by Bob Badour's avatar Bob Badour
Browse files

Keep Notice property from erasing license texts. 

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

Bug: 192434786

Test: m droid dist

Change-Id: Id3d845b2073f151a8c0bad874e7ab005771bdfcb
parent 50dbe0a0

android/androidmk.go

+1 −1
Original line number Diff line number Diff line
@@ -605,7 +605,7 @@ func (a *AndroidMkEntries) fillInEntries(ctx fillInEntriesContext, mod blueprint 
	}



	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 {

android/module.go

+0 −8
Original line number Diff line number Diff line
@@ -2328,14 +2328,6 @@ func (m *ModuleBase) GenerateBuildActions(blueprintCtx blueprint.ModuleContext) 
		}

		if optPath.Valid() {

			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)