diff options
| author | yoz <yoz@chromium.org> | 2014-08-26 20:32:58 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-27 03:33:52 +0000 |
| commit | 774dcda2d369584b2e964fa4971dda71cf819677 (patch) | |
| tree | f9e3058e383cb5bf00f263a03c48e44620b3bafd /build/json_schema_bundle_compile.gypi | |
| parent | 3f7aec31073c730a68ee221bbd10dca9a60e9a04 (diff) | |
| download | chromium_src-774dcda2d369584b2e964fa4971dda71cf819677.zip chromium_src-774dcda2d369584b2e964fa4971dda71cf819677.tar.gz chromium_src-774dcda2d369584b2e964fa4971dda71cf819677.tar.bz2 | |
Reland 596ff54335b2a1b393af10657bc4945114f3beed - Split API bundle generation steps
* Fixed in this version: dependencies for *_api_registration on *_api.
Split bundle generation steps so that API registration is generated in browser, not common.
We now have schema generation, schema bundle generation, and schema bundle registration generation; the last of these is generated in a separate build target and output to browser rather than common.
Fix a couple of dangling gyp issues also.
BUG=405226
TBR=scottmg@chromium.org,sky@chromium.org
Review URL: https://codereview.chromium.org/513633002
Cr-Commit-Position: refs/heads/master@{#292090}
Diffstat (limited to 'build/json_schema_bundle_compile.gypi')
| -rw-r--r-- | build/json_schema_bundle_compile.gypi | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/build/json_schema_bundle_compile.gypi b/build/json_schema_bundle_compile.gypi index 7e712d7..7560bdc 100644 --- a/build/json_schema_bundle_compile.gypi +++ b/build/json_schema_bundle_compile.gypi @@ -19,30 +19,29 @@ # chrome/browser/extensions/api and can be overridden by setting "impl_dir". 'api_gen_dir': '<(DEPTH)/tools/json_schema_compiler', 'api_gen': '<(api_gen_dir)/compiler.py', - 'impl_dir%': 'chrome/browser/extensions/api', + 'generator_files': [ + '<(api_gen_dir)/cc_generator.py', + '<(api_gen_dir)/code.py', + '<(api_gen_dir)/compiler.py', + '<(api_gen_dir)/cpp_bundle_generator.py', + '<(api_gen_dir)/cpp_type_generator.py', + '<(api_gen_dir)/cpp_util.py', + '<(api_gen_dir)/h_generator.py', + '<(api_gen_dir)/idl_schema.py', + '<(api_gen_dir)/json_schema.py', + '<(api_gen_dir)/model.py', + '<(api_gen_dir)/util_cc_helper.py', + ], }, 'actions': [ { - # GN version: //extensions/generated_extensions_api.gni - 'action_name': 'genapi_bundle', + 'action_name': 'genapi_bundle_schema', 'inputs': [ - '<(api_gen_dir)/cc_generator.py', - '<(api_gen_dir)/code.py', - '<(api_gen_dir)/compiler.py', - '<(api_gen_dir)/cpp_bundle_generator.py', - '<(api_gen_dir)/cpp_type_generator.py', - '<(api_gen_dir)/cpp_util.py', - '<(api_gen_dir)/h_generator.py', - '<(api_gen_dir)/idl_schema.py', - '<(api_gen_dir)/json_schema.py', - '<(api_gen_dir)/model.py', - '<(api_gen_dir)/util_cc_helper.py', + '<@(generator_files)', '<@(schema_files)', '<@(non_compiled_schema_files)', ], 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/<(cc_dir)/generated_api.h', - '<(SHARED_INTERMEDIATE_DIR)/<(cc_dir)/generated_api.cc', '<(SHARED_INTERMEDIATE_DIR)/<(cc_dir)/generated_schemas.h', '<(SHARED_INTERMEDIATE_DIR)/<(cc_dir)/generated_schemas.cc', ], @@ -52,14 +51,15 @@ '--root=<(DEPTH)', '--destdir=<(SHARED_INTERMEDIATE_DIR)', '--namespace=<(root_namespace)', - '--generator=cpp-bundle', - '--impl-dir=<(impl_dir)', + '--generator=cpp-bundle-schema', '<@(schema_files)', '<@(non_compiled_schema_files)', ], - 'message': 'Generating C++ API bundle code', + 'message': 'Generating C++ API bundle code for schemas', 'process_outputs_as_sources': 1, - } + # Avoid running MIDL compiler on IDL input files. + 'explicit_idl_action': 1, + }, ], 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)', |