Fix USE_SOONG[_FOR_KATI]

Make was depending on the installed path for ckati/makeparallel, since I
didn't want to hardcode intermediate paths.

For modules in USE_SOONG, we export the intermediate paths, so we don't
need to install.

Change-Id: I90bf3ad1461e239a8a40fd0c8ddbc679cf00d126
This commit is contained in:
Dan Willemsen
2016-01-14 11:22:23 -08:00
parent 468cc31584
commit 7f730fd0ad
2 changed files with 3 additions and 3 deletions

View File

@@ -519,7 +519,7 @@ func (a *androidModuleContext) InstallFileName(installPath OutputPath, name stri
fullInstallPath := installPath.Join(a, name)
if !a.AConfig().SkipInstall() {
if a.Host() || !a.AConfig().SkipDeviceInstall() {
deps = append(deps, a.installDeps...)
a.ModuleBuild(pctx, ModuleBuildParams{
@@ -527,7 +527,7 @@ func (a *androidModuleContext) InstallFileName(installPath OutputPath, name stri
Output: fullInstallPath,
Input: srcPath,
OrderOnly: Paths(deps),
Default: true,
Default: !a.AConfig().EmbeddedInMake(),
})
a.installFiles = append(a.installFiles, fullInstallPath)