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
diff --git a/common/config.go b/common/config.go
index a4a2039..6fd6dfc 100644
--- a/common/config.go
+++ b/common/config.go
@@ -304,6 +304,6 @@
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 988104f..ad2ba4e 100644
--- a/common/module.go
+++ b/common/module.go
@@ -519,7 +519,7 @@
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 @@
Output: fullInstallPath,
Input: srcPath,
OrderOnly: Paths(deps),
- Default: true,
+ Default: !a.AConfig().EmbeddedInMake(),
})
a.installFiles = append(a.installFiles, fullInstallPath)