diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-12-15 18:52:37 -0800 |
|---|---|---|
| committer | Dan Willemsen <dwillemsen@google.com> | 2017-12-15 18:52:37 -0800 |
| commit | 48a1ed6117cf2ec7c73803f9abb1579f4e80456b (patch) | |
| tree | 1326c51e2caed1dc241ea7986ea03d48da40a432 | |
| parent | ef0edd928a3fc44a568a0aeef57ed949b922e2f2 (diff) | |
| download | clang-48a1ed6117cf2ec7c73803f9abb1579f4e80456b.tar.gz | |
Stop using ninja reserved keyword
"generator" is a special ninja variable that changes the behavior of the
rule. While it's a boolean, these strings were causing it to be
interpreted as true.
Test: mmma external/clang; <nothing to do>
Change-Id: I1b0ad4bced87bc9f90e0d1d4d47edb6b9c7710ea
| -rw-r--r-- | soong/tblgen.go | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/soong/tblgen.go b/soong/tblgen.go index 2d00c20509..608a8a99e3 100644 --- a/soong/tblgen.go +++ b/soong/tblgen.go @@ -37,10 +37,10 @@ var ( tblgenRule = pctx.StaticRule("tblgenRule", blueprint.RuleParams{ Depfile: "${out}.d", Deps: blueprint.DepsGCC, - Command: "${clangTblgen} ${includes} ${generator} -d ${depfile} -o ${out} ${in}", + Command: "${clangTblgen} ${includes} ${genopt} -d ${depfile} -o ${out} ${in}", CommandDeps: []string{"${clangTblgen}"}, Description: "Clang TableGen $in => $out", - }, "includes", "depfile", "generator") + }, "includes", "depfile", "genopt") ) type tblgenProperties struct { @@ -79,8 +79,8 @@ func (t *tblgen) GenerateAndroidBuildActions(ctx android.ModuleContext) { Input: in, Output: out, Args: map[string]string{ - "includes": strings.Join(includes, " "), - "generator": generator, + "includes": strings.Join(includes, " "), + "genopt": generator, }, }) t.generatedHeaders = append(t.generatedHeaders, out) |