diff options
| author | Colin Cross <ccross@android.com> | 2015-12-18 19:03:03 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2015-12-18 19:03:03 +0000 |
| commit | 09d3e97d4e1c5b1e7cf80e26e6be798a0be4b0d3 (patch) | |
| tree | 85c08b0f3dba5faffdc180e65e3c9ed11820ea0e | |
| parent | da536e9a3623a8787720691c447355b36f1471b5 (diff) | |
| parent | 1604ecf5cc6e2fbd028fc06d9d46e9203f6b343b (diff) | |
| download | build_soong-09d3e97d4e1c5b1e7cf80e26e6be798a0be4b0d3.tar.gz build_soong-09d3e97d4e1c5b1e7cf80e26e6be798a0be4b0d3.tar.bz2 build_soong-09d3e97d4e1c5b1e7cf80e26e6be798a0be4b0d3.zip | |
Merge "Fix gofmt"
| -rw-r--r-- | common/module.go | 2 | ||||
| -rw-r--r-- | genrule/genrule.go | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/common/module.go b/common/module.go index bdaeb7aa..c22f000e 100644 --- a/common/module.go +++ b/common/module.go @@ -595,7 +595,7 @@ func (c *buildTargetSingleton) GenerateBuildActions(ctx blueprint.SingletonConte Implicits: dirModules[dir], // HACK: checkbuild should be an optional build, but force it // enabled for now in standalone builds - Optional: ctx.Config().(Config).EmbeddedInMake(), + Optional: ctx.Config().(Config).EmbeddedInMake(), }) } } diff --git a/genrule/genrule.go b/genrule/genrule.go index b5543570..8291d5b8 100644 --- a/genrule/genrule.go +++ b/genrule/genrule.go @@ -86,9 +86,9 @@ func genruleDepsMutator(ctx common.AndroidBottomUpMutatorContext) { if g, ok := ctx.Module().(*generator); ok { if g.properties.Tool != "" { ctx.AddFarVariationDependencies([]blueprint.Variation{ - {"host_or_device", common.Host.String()}, - {"host_type", common.CurrentHostType().String()}, - }, g.properties.Tool) + {"host_or_device", common.Host.String()}, + {"host_type", common.CurrentHostType().String()}, + }, g.properties.Tool) } } } |