diff options
Diffstat (limited to 'android/module_context.go')
| -rw-r--r-- | android/module_context.go | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/android/module_context.go b/android/module_context.go index f5104b842..6b64b1deb 100644 --- a/android/module_context.go +++ b/android/module_context.go @@ -251,6 +251,14 @@ type moduleContext struct { katiInstalls katiInstalls katiSymlinks katiInstalls + // katiInitRcInstalls and katiVintfInstalls track the install rules created by Soong that are + // allowed to have duplicates across modules and variants. + katiInitRcInstalls katiInstalls + katiVintfInstalls katiInstalls + initRcPaths Paths + vintfFragmentsPaths Paths + installedInitRcPaths InstallPaths + installedVintfFragmentsPaths InstallPaths testData []DataPath @@ -535,8 +543,8 @@ func (m *moduleContext) installFile(installPath InstallPath, name string, srcPat if m.requiresFullInstall() { deps = append(deps, InstallPaths(m.TransitiveInstallFiles.ToList())...) - deps = append(deps, m.module.base().installedInitRcPaths...) - deps = append(deps, m.module.base().installedVintfFragmentsPaths...) + deps = append(deps, m.installedInitRcPaths...) + deps = append(deps, m.installedVintfFragmentsPaths...) var implicitDeps, orderOnlyDeps Paths |