diff options
| author | 2020-12-16 10:20:23 -0800 | |
|---|---|---|
| committer | 2020-12-17 10:02:18 -0800 | |
| commit | a9c8c9f1457a3848ff0d2c6bcb3dfbe256c1b8d4 (patch) | |
| tree | 4f8131e3064cad70d015689cfda55bc15e1c0cd2 /android/override_module.go | |
| parent | 95b07f2b59049dd4a539780ed0c91b8809ce97a9 (diff) | |
Call ctx.InstallFile for uninstallable cc modules
SkipInstall is actually primarily used to prevent making a module
visible to Make, rename it and add new SkipInstall that actually
skips installation without affecting Make.
Call c.SkipInstall() for uninstallable cc modules to allow calling
c.installer.install, which will collect PackagingSpecs for
uninstallable cc modules, allowing them to be used by genrules.
Bug: 124313442
Test: m checkbuild
Change-Id: I8038ed5c6f05c989ac21ec06c4552fb3136b9a7a
Diffstat (limited to 'android/override_module.go')
| -rw-r--r-- | android/override_module.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/android/override_module.go b/android/override_module.go index f8342d52d..fa0856631 100644 --- a/android/override_module.go +++ b/android/override_module.go @@ -235,7 +235,7 @@ func overrideModuleDepsMutator(ctx BottomUpMutatorContext) { return } // See if there's a prebuilt module that overrides this override module with prefer flag, - // in which case we call SkipInstall on the corresponding variant later. + // in which case we call HideFromMake on the corresponding variant later. ctx.VisitDirectDepsWithTag(PrebuiltDepTag, func(dep Module) { prebuilt, ok := dep.(PrebuiltInterface) if !ok { @@ -284,7 +284,7 @@ func performOverrideMutator(ctx BottomUpMutatorContext) { mods[i+1].(OverridableModule).override(ctx, o) if o.getOverriddenByPrebuilt() { // The overriding module itself, too, is overridden by a prebuilt. Skip its installation. - mods[i+1].SkipInstall() + mods[i+1].HideFromMake() } } } else if o, ok := ctx.Module().(OverrideModule); ok { |