diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2016-01-14 11:22:23 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2016-01-14 11:24:27 -0800 |
| commit | 7f730fd0ad2e3e7e33dbb3f2b63889d7dab98edf (patch) | |
| tree | 1dc95902ef556da3413f9cc66dd291a74e7bb4c9 | |
| parent | 468cc315846c61fded49d7a753770b62f244501f (diff) | |
| download | build_soong-7f730fd0ad2e3e7e33dbb3f2b63889d7dab98edf.tar.gz build_soong-7f730fd0ad2e3e7e33dbb3f2b63889d7dab98edf.tar.bz2 build_soong-7f730fd0ad2e3e7e33dbb3f2b63889d7dab98edf.zip | |
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
| -rw-r--r-- | common/config.go | 2 | ||||
| -rw-r--r-- | common/module.go | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/common/config.go b/common/config.go index a4a20393..6fd6dfce 100644 --- a/common/config.go +++ b/common/config.go @@ -304,6 +304,6 @@ func (c *config) AllowMissingDependencies() bool { return Bool(c.ProductVariables.Unbundled_build) } -func (c *config) SkipInstall() bool { +func (c *config) SkipDeviceInstall() bool { return c.EmbeddedInMake() || Bool(c.Mega_device) } diff --git a/common/module.go b/common/module.go index 988104ff..ad2ba4e7 100644 --- a/common/module.go +++ b/common/module.go @@ -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) |