diff options
| author | 2024-09-04 00:03:20 +0000 | |
|---|---|---|
| committer | 2024-09-04 00:03:20 +0000 | |
| commit | b11c99d0848da4e1177b8c460c1437cc7dbce9d1 (patch) | |
| tree | 72c9630a7d2b453efef377bc693282a86cbff222 /android/module_context.go | |
| parent | aebccc735a9173454faa7124ebf7a640cd9741d9 (diff) | |
| parent | a574d535b50ed5f01162dddd3bfbfa495dcba876 (diff) | |
Merge "Make overrides work in Soong" into main
Diffstat (limited to 'android/module_context.go')
| -rw-r--r-- | android/module_context.go | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/android/module_context.go b/android/module_context.go index c677f9482..6765560d9 100644 --- a/android/module_context.go +++ b/android/module_context.go @@ -543,6 +543,7 @@ func (m *moduleContext) setAconfigPaths(paths Paths) { func (m *moduleContext) packageFile(fullInstallPath InstallPath, srcPath Path, executable bool) PackagingSpec { licenseFiles := m.Module().EffectiveLicenseFiles() + overrides := CopyOf(m.Module().base().commonProperties.Overrides) spec := PackagingSpec{ relPathInPackage: Rel(m, fullInstallPath.PartitionDir(), fullInstallPath.String()), srcPath: srcPath, @@ -553,6 +554,8 @@ func (m *moduleContext) packageFile(fullInstallPath InstallPath, srcPath Path, e skipInstall: m.skipInstall(), aconfigPaths: m.getAconfigPaths(), archType: m.target.Arch.ArchType, + overrides: &overrides, + owner: m.ModuleName(), } m.packagingSpecs = append(m.packagingSpecs, spec) return spec @@ -670,6 +673,7 @@ func (m *moduleContext) InstallSymlink(installPath InstallPath, name string, src m.checkbuildFiles = append(m.checkbuildFiles, srcPath) } + overrides := CopyOf(m.Module().base().commonProperties.Overrides) m.packagingSpecs = append(m.packagingSpecs, PackagingSpec{ relPathInPackage: Rel(m, fullInstallPath.PartitionDir(), fullInstallPath.String()), srcPath: nil, @@ -679,6 +683,8 @@ func (m *moduleContext) InstallSymlink(installPath InstallPath, name string, src skipInstall: m.skipInstall(), aconfigPaths: m.getAconfigPaths(), archType: m.target.Arch.ArchType, + overrides: &overrides, + owner: m.ModuleName(), }) return fullInstallPath @@ -714,6 +720,7 @@ func (m *moduleContext) InstallAbsoluteSymlink(installPath InstallPath, name str m.installFiles = append(m.installFiles, fullInstallPath) } + overrides := CopyOf(m.Module().base().commonProperties.Overrides) m.packagingSpecs = append(m.packagingSpecs, PackagingSpec{ relPathInPackage: Rel(m, fullInstallPath.PartitionDir(), fullInstallPath.String()), srcPath: nil, @@ -723,6 +730,8 @@ func (m *moduleContext) InstallAbsoluteSymlink(installPath InstallPath, name str skipInstall: m.skipInstall(), aconfigPaths: m.getAconfigPaths(), archType: m.target.Arch.ArchType, + overrides: &overrides, + owner: m.ModuleName(), }) return fullInstallPath |