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

Commit b9386b70 authored by Treehugger Robot's avatar Treehugger Robot Committed by Gerrit Code Review
Browse files

Merge "Share EffectiveLicenseFiles for snapshot modules"

parents e9204db2 885a7dea

android/module.go

+5 −0
Original line number Diff line number Diff line
@@ -483,6 +483,7 @@ type Module interface { 
	InitRc() Paths

	VintfFragments() Paths

	NoticeFiles() Paths

	EffectiveLicenseFiles() Paths



	AddProperties(props ...interface{})

	GetProperties() []interface{}
@@ -1515,6 +1516,10 @@ func (m *ModuleBase) ExportedToMake() bool { 
	return m.commonProperties.NamespaceExportedToMake

}



func (m *ModuleBase) EffectiveLicenseFiles() Paths {

	return m.commonProperties.Effective_license_text

}



// computeInstallDeps finds the installed paths of all dependencies that have a dependency

// tag that is annotated as needing installation via the IsInstallDepNeeded method.

func (m *ModuleBase) computeInstallDeps(ctx ModuleContext) ([]*installPathsDepSet, []*packagingSpecsDepSet) {

cc/linkable.go

+3 −0
Original line number Diff line number Diff line
@@ -83,6 +83,9 @@ type Snapshottable interface { 
	// SnapshotLibrary returns true if this module is a snapshot library.

	IsSnapshotLibrary() bool



	// EffectiveLicenseFiles returns the list of License files for this module.

	EffectiveLicenseFiles() android.Paths



	// SnapshotRuntimeLibs returns a list of libraries needed by this module at runtime but which aren't build dependencies.

	SnapshotRuntimeLibs() []string

cc/vendor_snapshot.go

+2 −2
Original line number Diff line number Diff line
@@ -501,13 +501,13 @@ func (c *snapshotSingleton) GenerateBuildActions(ctx android.SingletonContext) { 
			headers = append(headers, m.SnapshotHeaders()...)

		}



		if len(m.NoticeFiles()) > 0 {

		if len(m.EffectiveLicenseFiles()) > 0 {

			noticeName := ctx.ModuleName(m) + ".txt"

			noticeOut := filepath.Join(noticeDir, noticeName)

			// skip already copied notice file

			if !installedNotices[noticeOut] {

				installedNotices[noticeOut] = true

				snapshotOutputs = append(snapshotOutputs, combineNoticesRule(ctx, m.NoticeFiles(), noticeOut))

				snapshotOutputs = append(snapshotOutputs, combineNoticesRule(ctx, m.EffectiveLicenseFiles(), noticeOut))

			}

		}

	})