diff options
| author | 2020-06-04 01:26:16 +0100 | |
|---|---|---|
| committer | 2020-06-04 01:26:16 +0100 | |
| commit | 07656410df1836a70bea3054e50bb410ecbf8e07 (patch) | |
| tree | 96dc0b045dfa8b0d3a07d6e41acb1c961cd811df /android/module.go | |
| parent | 3747336d233103c9660d06699f6ac1bb86d405ce (diff) | |
Add SrcPath to InstallHookContext
Needed by ART to find the intermediate files so that it
can also install them in testcases directory for tests.
Change-Id: If1b2ad132632c5dc7c6c7573b56680e2f422594a
Diffstat (limited to 'android/module.go')
| -rw-r--r-- | android/module.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/android/module.go b/android/module.go index 82321f417..54526139c 100644 --- a/android/module.go +++ b/android/module.go @@ -1955,7 +1955,7 @@ func (m *moduleContext) installFile(installPath InstallPath, name string, srcPat rule blueprint.Rule, deps []Path) InstallPath { fullInstallPath := installPath.Join(m, name) - m.module.base().hooks.runInstallHooks(m, fullInstallPath, false) + m.module.base().hooks.runInstallHooks(m, srcPath, fullInstallPath, false) if !m.skipInstall(fullInstallPath) { @@ -1989,7 +1989,7 @@ func (m *moduleContext) installFile(installPath InstallPath, name string, srcPat func (m *moduleContext) InstallSymlink(installPath InstallPath, name string, srcPath InstallPath) InstallPath { fullInstallPath := installPath.Join(m, name) - m.module.base().hooks.runInstallHooks(m, fullInstallPath, true) + m.module.base().hooks.runInstallHooks(m, srcPath, fullInstallPath, true) if !m.skipInstall(fullInstallPath) { @@ -2018,7 +2018,7 @@ func (m *moduleContext) InstallSymlink(installPath InstallPath, name string, src // (e.g. /apex/...) func (m *moduleContext) InstallAbsoluteSymlink(installPath InstallPath, name string, absPath string) InstallPath { fullInstallPath := installPath.Join(m, name) - m.module.base().hooks.runInstallHooks(m, fullInstallPath, true) + m.module.base().hooks.runInstallHooks(m, nil, fullInstallPath, true) if !m.skipInstall(fullInstallPath) { m.Build(pctx, BuildParams{ |