diff options
| author | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 01:10:46 +0000 |
|---|---|---|
| committer | sky@chromium.org <sky@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2014-04-04 01:10:46 +0000 |
| commit | ae3146650d0dad82759dfee3bf15079d98431be6 (patch) | |
| tree | a7fa7c0e1b745044b5a9f88dbdba005eac22c70a | |
| parent | 04c1db3f201db9db6e5906b89b75d6475175d8a8 (diff) | |
| download | chromium_src-ae3146650d0dad82759dfee3bf15079d98431be6.zip chromium_src-ae3146650d0dad82759dfee3bf15079d98431be6.tar.gz chromium_src-ae3146650d0dad82759dfee3bf15079d98431be6.tar.bz2 | |
Replace RULE_INPUT_PATH with RULE_INPUT_DIRNAME/RULE_INPUT_ROOT.mojom
This is necessitated by the webview build, which does not use ninja
and does not support RULE_INPUT_PATH.
BUG=none
TEST=none
R=viettrungluu@chromium.org
Review URL: https://codereview.chromium.org/213693011
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@261621 0039d316-1c4b-4281-b951-d872f2087c98
| -rw-r--r-- | build/common.gypi | 2 | ||||
| -rw-r--r-- | mojo/public/bindings/mojom_bindings_generator.gypi | 12 |
2 files changed, 7 insertions, 7 deletions
diff --git a/build/common.gypi b/build/common.gypi index 58c48ef..d094ed2 100644 --- a/build/common.gypi +++ b/build/common.gypi @@ -864,7 +864,7 @@ 'enable_printing%': 0, }], - ['OS=="win" or OS=="linux" or OS=="mac" or (OS=="android" and android_webview_build==0)', { + ['OS=="win" or OS=="linux" or OS=="mac" or OS=="android"', { 'use_mojo%': 1, }], diff --git a/mojo/public/bindings/mojom_bindings_generator.gypi b/mojo/public/bindings/mojom_bindings_generator.gypi index 865defc..4c3ac18 100644 --- a/mojo/public/bindings/mojom_bindings_generator.gypi +++ b/mojo/public/bindings/mojom_bindings_generator.gypi @@ -51,18 +51,18 @@ '<(DEPTH)/mojo/public/bindings/pylib/generate/template_expander.py', ], 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_PATH).cc', - '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_PATH).h', - '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_PATH).js', - '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_PATH)-internal.h', + '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).mojom.cc', + '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).mojom.h', + '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).mojom.js', + '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).mojom-internal.h', ], 'action': [ 'python', '<@(mojom_bindings_generator)', - '<(RULE_INPUT_PATH)', + '<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).mojom', '-d', '<(DEPTH)', '-o', '<(SHARED_INTERMEDIATE_DIR)/<(mojom_base_output_dir)/<(RULE_INPUT_DIRNAME)', ], - 'message': 'Generating Mojo bindings from <(RULE_INPUT_PATH)', + 'message': 'Generating Mojo bindings from <(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).mojom', 'process_outputs_as_sources': 1, } ], |