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

Commit 4dc2a1aa authored by Jiyong Park's avatar Jiyong Park
Browse files

Expose android.filesToInstall 

It will be used by the cvd_host_package module type to gather installed
files and package them in a distributable format.

Bug: 168086242
Test: m

Change-Id: I3af6dcda0bce1f298b1500fbac311c9593ddf375
parent 19dfeee7

android/module.go

+3 −3
Original line number Diff line number Diff line
@@ -435,7 +435,7 @@ type Module interface { 
	HostRequiredModuleNames() []string

	TargetRequiredModuleNames() []string



	filesToInstall() InstallPaths

	FilesToInstall() InstallPaths

}



// Qualified id for a module
@@ -1241,14 +1241,14 @@ func (m *ModuleBase) computeInstallDeps(ctx blueprint.ModuleContext) InstallPath 
	// TODO(ccross): we need to use WalkDeps and have some way to know which dependencies require installation

	ctx.VisitDepsDepthFirst(func(m blueprint.Module) {

		if a, ok := m.(Module); ok {

			result = append(result, a.filesToInstall()...)

			result = append(result, a.FilesToInstall()...)

		}

	})



	return result

}



func (m *ModuleBase) filesToInstall() InstallPaths {

func (m *ModuleBase) FilesToInstall() InstallPaths {

	return m.installFiles

}

android/test_suites.go

+1 −1
Original line number Diff line number Diff line
@@ -41,7 +41,7 @@ func (t *testSuiteFiles) GenerateBuildActions(ctx SingletonContext) { 
					files[testSuite] = make(map[string]InstallPaths)

				}

				name := ctx.ModuleName(m)

				files[testSuite][name] = append(files[testSuite][name], tsm.filesToInstall()...)

				files[testSuite][name] = append(files[testSuite][name], tsm.FilesToInstall()...)

			}

		}

	})