diff options
| author | Colin Cross <ccross@android.com> | 2020-12-16 10:20:23 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2020-12-17 10:02:18 -0800 |
| commit | a9c8c9f1457a3848ff0d2c6bcb3dfbe256c1b8d4 (patch) | |
| tree | 4f8131e3064cad70d015689cfda55bc15e1c0cd2 /cc/vndk_prebuilt.go | |
| parent | 95b07f2b59049dd4a539780ed0c91b8809ce97a9 (diff) | |
| download | soong-a9c8c9f1457a3848ff0d2c6bcb3dfbe256c1b8d4.tar.gz | |
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 'cc/vndk_prebuilt.go')
| -rw-r--r-- | cc/vndk_prebuilt.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/cc/vndk_prebuilt.go b/cc/vndk_prebuilt.go index e6e2ad85d..04162cdce 100644 --- a/cc/vndk_prebuilt.go +++ b/cc/vndk_prebuilt.go @@ -130,7 +130,7 @@ func (p *vndkPrebuiltLibraryDecorator) link(ctx ModuleContext, flags Flags, deps PathDeps, objs Objects) android.Path { if !p.matchesWithDevice(ctx.DeviceConfig()) { - ctx.Module().SkipInstall() + ctx.Module().HideFromMake() return nil } @@ -175,7 +175,7 @@ func (p *vndkPrebuiltLibraryDecorator) link(ctx ModuleContext, return in } - ctx.Module().SkipInstall() + ctx.Module().HideFromMake() return nil } |