diff options
| author | Dan Willemsen <dwillemsen@google.com> | 2017-12-16 06:42:11 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-12-16 06:42:11 +0000 |
| commit | a087ad6fd53a1126912012ec08d40c3930672abe (patch) | |
| tree | 1326c51e2caed1dc241ea7986ea03d48da40a432 | |
| parent | ef0edd928a3fc44a568a0aeef57ed949b922e2f2 (diff) | |
| parent | ada6fc6a425edd49bd5c2ca827db369c35224541 (diff) | |
| download | clang-a087ad6fd53a1126912012ec08d40c3930672abe.tar.gz | |
Merge "Stop using ninja reserved keyword"
am: ada6fc6a42
Change-Id: I2727a2a5b1d20d13133cdb9af6364026dd0dbc5c
| -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) |