Commit bdeecd1b authored by Shik Chen's avatar Shik Chen Committed by Commit Bot

CCA: Fix locale generation of cca deploy command

The i18n json files are now generated in subdirectories for platform app
and SWA.

Bug: b/172879638
Test: cca deploy
Change-Id: I404b42b2afdca4eb4a628bb49c44365dc7b21741
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2549381
Auto-Submit: Shik Chen <shik@chromium.org>
Reviewed-by: default avatarWei Lee <wtlee@chromium.org>
Commit-Queue: Wei Lee <wtlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#829190}
parent 49446992
...@@ -41,6 +41,10 @@ def build_locale_strings(): ...@@ -41,6 +41,10 @@ def build_locale_strings():
'-i', '-i',
'strings/camera_strings.grd', 'strings/camera_strings.grd',
'build', 'build',
'-E',
'out_camera_app_dir=platform',
'-E',
'gen_camera_app_dir=swa',
'-o', '-o',
'build/strings', 'build/strings',
] ]
...@@ -166,7 +170,7 @@ def build_cca(overlay=None, key=None): ...@@ -166,7 +170,7 @@ def build_cca(overlay=None, key=None):
mojo_files = ['mojo_bindings_lite.js'] + mojom_bindings mojo_files = ['mojo_bindings_lite.js'] + mojom_bindings
# TODO(shik): Check mtime and rebuild them if the source is updated. # TODO(shik): Check mtime and rebuild them if the source is updated.
if not os.path.exists('build/strings'): if not os.path.exists('build/strings/platform'):
build_locale_strings() build_locale_strings()
if any(not os.path.exists(os.path.join('build/mojo', f)) if any(not os.path.exists(os.path.join('build/mojo', f))
for f in mojo_files): for f in mojo_files):
...@@ -176,7 +180,7 @@ def build_cca(overlay=None, key=None): ...@@ -176,7 +180,7 @@ def build_cca(overlay=None, key=None):
dir_list = [src for src in os.listdir('.') if os.path.isdir(src)] dir_list = [src for src in os.listdir('.') if os.path.isdir(src)]
for d in dir_list: for d in dir_list:
if d == 'build': if d in ['build', 'node_modules', 'strings']:
continue continue
dir_util.copy_tree(d, os.path.join('build/camera', d)) dir_util.copy_tree(d, os.path.join('build/camera', d))
build_preload_images_js() build_preload_images_js()
...@@ -184,7 +188,7 @@ def build_cca(overlay=None, key=None): ...@@ -184,7 +188,7 @@ def build_cca(overlay=None, key=None):
for f in mojo_files: for f in mojo_files:
shutil.copy2(os.path.join('build/mojo', f), 'build/camera/js/mojo') shutil.copy2(os.path.join('build/mojo', f), 'build/camera/js/mojo')
dir_util.copy_tree('build/strings', 'build/camera') dir_util.copy_tree('build/strings/platform', 'build/camera')
if overlay == 'dev': if overlay == 'dev':
dir_util.copy_tree('utils/dev', 'build/camera') dir_util.copy_tree('utils/dev', 'build/camera')
......
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