diff options
| author | Colin Cross <ccross@android.com> | 2015-12-17 17:19:51 -0800 |
|---|---|---|
| committer | Colin Cross <ccross@android.com> | 2015-12-17 17:25:10 -0800 |
| commit | 346aa13c4a03075e66b14d8797a5b577164b5c3b (patch) | |
| tree | ae17954f7bb439e9512d20de794272b29acff08d | |
| parent | 1604ecf5cc6e2fbd028fc06d9d46e9203f6b343b (diff) | |
| download | build_soong-346aa13c4a03075e66b14d8797a5b577164b5c3b.tar.gz build_soong-346aa13c4a03075e66b14d8797a5b577164b5c3b.tar.bz2 build_soong-346aa13c4a03075e66b14d8797a5b577164b5c3b.zip | |
Make all soong modules optional when building in make
When building inside make, Soong is not responsible for installing any
modules, so make everything optional.
Change-Id: I1190c78663c9d5ff6f511ca43b317031c619afe7
| -rw-r--r-- | common/module.go | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/common/module.go b/common/module.go index c22f000e..e03b006e 100644 --- a/common/module.go +++ b/common/module.go @@ -313,6 +313,7 @@ func (a *AndroidModuleBase) generateModuleTarget(ctx blueprint.ModuleContext) { Rule: blueprint.Phony, Outputs: []string{name}, Implicits: allInstalledFiles.Strings(), + Optional: ctx.Config().(Config).EmbeddedInMake(), }) deps = append(deps, name) a.installTarget = name @@ -471,7 +472,7 @@ func (a *androidModuleContext) InstallFileName(installPath, name string, srcPath Output: fullInstallPath, Input: srcPath, OrderOnly: Paths(deps), - Default: true, + Default: !a.AConfig().EmbeddedInMake(), }) a.installFiles = append(a.installFiles, fullInstallPath) |