diff options
| author | pastarmovj@google.com <pastarmovj@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-06-25 21:36:59 +0900 |
|---|---|---|
| committer | Qijiang Fan <fqj@google.com> | 2020-06-04 17:00:05 +0900 |
| commit | d928217aec2280a968851151f9df1179461c87a7 (patch) | |
| tree | 43206566cdb07d3dd852b760535091cf971d2c76 /mojo/public/tools/bindings/pylib/mojom/generate | |
| parent | b35f8abad9bb7efde57ea7446f0a81d0235a081a (diff) | |
| download | libchrome-d928217aec2280a968851151f9df1179461c87a7.tar.gz | |
Revert 279677 "Generate java bindings for structs."
Broke the Linux x64 build http://build.chromium.org/p/chromium/builders/Linux%20x64/builds/66839/steps/compile/logs/stdio
> Generate java bindings for structs.
>
> This CL introduces bindings for struct. It only generates fields and not
> serialization/deserialization methods.
>
> R=rmcilroy@chromium.org, viettrungluu@chromium.org
>
> Review URL: https://codereview.chromium.org/306893010
TBR=qsr@chromium.org
Review URL: https://codereview.chromium.org/354833003
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@279688 0039d316-1c4b-4281-b951-d872f2087c98
CrOS-Libchrome-Original-Commit: 8723cf789893fba470c4edc5bf75bbcafad6f92e
Diffstat (limited to 'mojo/public/tools/bindings/pylib/mojom/generate')
| -rw-r--r-- | mojo/public/tools/bindings/pylib/mojom/generate/generator.py | 8 | ||||
| -rw-r--r-- | mojo/public/tools/bindings/pylib/mojom/generate/template_expander.py | 11 |
2 files changed, 3 insertions, 16 deletions
diff --git a/mojo/public/tools/bindings/pylib/mojom/generate/generator.py b/mojo/public/tools/bindings/pylib/mojom/generate/generator.py index 9eb90a9b74..aea5de8e5c 100644 --- a/mojo/public/tools/bindings/pylib/mojom/generate/generator.py +++ b/mojo/public/tools/bindings/pylib/mojom/generate/generator.py @@ -97,11 +97,3 @@ class Generator(object): def GenerateFiles(self, args): raise NotImplementedError("Subclasses must override/implement this method") - - def GetJinjaParameters(self): - """Returns default constructor parameters for the jinja environment.""" - return {} - - def GetGlobals(self): - """Returns global mappings for the template generation.""" - return {} diff --git a/mojo/public/tools/bindings/pylib/mojom/generate/template_expander.py b/mojo/public/tools/bindings/pylib/mojom/generate/template_expander.py index adf9cf78a6..86ea0eac0b 100644 --- a/mojo/public/tools/bindings/pylib/mojom/generate/template_expander.py +++ b/mojo/public/tools/bindings/pylib/mojom/generate/template_expander.py @@ -30,16 +30,12 @@ except ImportError: import jinja2 -def ApplyTemplate(mojo_generator, base_dir, path_to_template, params, - filters=None, **kwargs): +def ApplyTemplate(base_dir, path_to_template, params, filters=None, **kwargs): template_directory, template_name = os.path.split(path_to_template) path_to_templates = os.path.join(base_dir, template_directory) loader = jinja2.FileSystemLoader([path_to_templates]) - final_kwargs = dict(mojo_generator.GetJinjaParameters()) - final_kwargs.update(kwargs) jinja_env = jinja2.Environment(loader=loader, keep_trailing_newline=True, - **final_kwargs) - jinja_env.globals.update(mojo_generator.GetGlobals()); + **kwargs) if filters: jinja_env.filters.update(filters) template = jinja_env.get_template(template_name) @@ -52,8 +48,7 @@ def UseJinja(path_to_template, **kwargs): def RealDecorator(generator): def GeneratorInternal(*args, **kwargs2): parameters = generator(*args, **kwargs2) - return ApplyTemplate(args[0], base_dir, path_to_template, parameters, - **kwargs) + return ApplyTemplate(base_dir, path_to_template, parameters, **kwargs) GeneratorInternal.func_name = generator.func_name return GeneratorInternal return RealDecorator |