third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py - Issue 877993004: Revert "Update mojo sdk to rev 8d45c89c30b230843c5bd6dd0693a555750946c0"

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py

Issue 877993004: Revert "Update mojo sdk to rev 8d45c89c30b230843c5bd6dd0693a555750946c0" (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_go_generator.py ('k') | third_party/mojo/src/mojo/public/tools/bindings/mojom.gni » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py

diff --git a/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py b/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py

index ad8980dd5030cbe4ac8d6fb196a456eb9b4f894f..276d5af0593b8ec9188a8549ba19432c668c7666 100644

--- a/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py

+++ b/third_party/mojo/src/mojo/public/tools/bindings/generators/mojom_java_generator.py

@@ -15,7 +15,6 @@ import zipfile

from jinja2 import contextfilter

-import mojom.fileutil as fileutil

import mojom.generate.generator as generator

import mojom.generate.module as mojom

from mojom.generate.template_expander import UseJinja

@@ -213,7 +212,7 @@ def EncodeMethod(context, kind, variable, offset, bit):

return 'encode(%s)' % ', '.join(params)

def GetPackage(module):

- if module.attributes and 'JavaPackage' in module.attributes:

+ if 'JavaPackage' in module.attributes:

return ParseStringAttribute(module.attributes['JavaPackage'])

# Default package.

if module.namespace:

@@ -357,7 +356,7 @@ def GetStructFromMethod(method):

False, generator.GetStructFromMethod(method))

def GetConstantsMainEntityName(module):

- if module.attributes and 'JavaConstantsClassName' in module.attributes:

+ if 'JavaConstantsClassName' in module.attributes:

return ParseStringAttribute(module.attributes['JavaConstantsClassName'])

# This constructs the name of the embedding classes for module level constants

# by extracting the mojom's filename and prepending it to Constants.

@@ -472,7 +471,12 @@ class Generator(generator.Generator):

return exports

def DoGenerateFiles(self):

- fileutil.EnsureDirectoryExists(self.output_dir)

+ if not os.path.exists(self.output_dir):

+ try:

+ os.makedirs(self.output_dir)

+ except:

+ # Ignore errors on directory creation.

+ pass

# Keep this above the others as .GetStructs() changes the state of the

# module, annotating structs with required information.