Merge "Expose android.filesToInstall" (c8821b94) · Commits · e / os / android_build_soong

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
		}

+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()...)
		}
		}
		})