Commit d8ca6e73 authored by Wei Lee's avatar Wei Lee Committed by Commit Bot

CCA: Fix deploy function in cca.py

The deploy function is broken due to the following changes:
https://crrev.com/c/2076710
https://crrev.com/c/2098849

Bug: 1061414
Test: cca deploy works normally
Change-Id: I5584047bfb3b64e3a4f8c92aaa396ce69cdcbd19
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2102304Reviewed-by: default avatarShik Chen <shik@chromium.org>
Commit-Queue: Wei Lee <wtlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#750432}
parent fe6cc8d6
...@@ -47,7 +47,7 @@ def build_locale_strings(): ...@@ -47,7 +47,7 @@ def build_locale_strings():
def build_mojom_bindings(mojom_bindings): def build_mojom_bindings(mojom_bindings):
pylib = os.path.join(get_chromium_root(), pylib = os.path.join(get_chromium_root(),
'mojo/public/tools/bindings/pylib') 'mojo/public/tools/mojom')
sys.path.insert(0, pylib) sys.path.insert(0, pylib)
# pylint: disable=import-error,import-outside-toplevel # pylint: disable=import-error,import-outside-toplevel
from mojom.parse.parser import Parse from mojom.parse.parser import Parse
...@@ -83,26 +83,28 @@ def build_mojom_bindings(mojom_bindings): ...@@ -83,26 +83,28 @@ def build_mojom_bindings(mojom_bindings):
precompile_cmd = [ precompile_cmd = [
generator, generator,
'--use_bundled_pylibs',
'precompile',
'-o', '-o',
'build/mojo', 'build/mojo',
'--use_bundled_pylibs',
'precompile',
] ]
run(precompile_cmd) run(precompile_cmd)
parse_cmd = [ parse_cmd = [
generator, generator,
'-o',
'build/mojo',
'--use_bundled_pylibs', '--use_bundled_pylibs',
'parse', 'parse',
'-d', '-d',
get_chromium_root(), get_chromium_root(),
'-o',
'build/mojo',
] + list(mojom_paths) ] + list(mojom_paths)
run(parse_cmd) run(parse_cmd)
generate_cmd = [ generate_cmd = [
generator, generator,
'-o',
'build/mojo',
'--use_bundled_pylibs', '--use_bundled_pylibs',
'generate', 'generate',
'-d', '-d',
...@@ -111,8 +113,6 @@ def build_mojom_bindings(mojom_bindings): ...@@ -111,8 +113,6 @@ def build_mojom_bindings(mojom_bindings):
get_chromium_root(), get_chromium_root(),
'--bytecode_path', '--bytecode_path',
'build/mojo', 'build/mojo',
'-o',
'build/mojo',
'-g', '-g',
'javascript', 'javascript',
'--js_bindings_mode', '--js_bindings_mode',
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment