diff options
| author | 2024-08-27 19:02:29 +0000 | |
|---|---|---|
| committer | 2024-08-27 19:03:35 +0000 | |
| commit | 82a6d1464d91a08a702435f5766f44a34672d24d (patch) | |
| tree | be444bc55aa748e9ca5fbc66a41fb5e6ef9ce348 /android/module_context.go | |
| parent | bbcbe86fe316e2e7064bbb529bc6a25026d24f1e (diff) | |
Remove 6 install related fields from ModuleBase.
Bug: 358425833
Test: Manually verified all the generated ninja and mk files and CI.
Change-Id: If2c3417781953a1eef2b07a241424157fd73abff
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 |