diff options
| author | Colin Cross <ccross@android.com> | 2015-12-18 19:03:12 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-18 19:03:12 +0000 |
| commit | 66fe5656b4abd53249b1e1ea3952fba8bacde10c (patch) | |
| tree | 791751b4c2be46994da8de4bb3d55b21139fd69c /common | |
| parent | 09d3e97d4e1c5b1e7cf80e26e6be798a0be4b0d3 (diff) | |
| parent | 346aa13c4a03075e66b14d8797a5b577164b5c3b (diff) | |
| download | build_soong-66fe5656b4abd53249b1e1ea3952fba8bacde10c.tar.gz build_soong-66fe5656b4abd53249b1e1ea3952fba8bacde10c.tar.bz2 build_soong-66fe5656b4abd53249b1e1ea3952fba8bacde10c.zip | |
Merge "Make all soong modules optional when building in make"
Diffstat (limited to 'common')
| -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) |