diff options
| author | lfg <lfg@chromium.org> | 2014-08-28 20:56:28 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2014-08-29 03:58:01 +0000 |
| commit | 8a1bee36d9f609ab9a98ecf89bf1dfc0bb4762dc (patch) | |
| tree | 98801b1699e47204b60186ec5619e1ba9a492157 /build | |
| parent | 792dcd9ba6050f1dce72f9a7e1961e0f0ceabc2c (diff) | |
| download | chromium_src-8a1bee36d9f609ab9a98ecf89bf1dfc0bb4762dc.zip chromium_src-8a1bee36d9f609ab9a98ecf89bf1dfc0bb4762dc.tar.gz chromium_src-8a1bee36d9f609ab9a98ecf89bf1dfc0bb4762dc.tar.bz2 | |
- Add support for references in different paths in apis.
- Move ImageDetails from chrome to extensions.
BUG=352290
Review URL: https://codereview.chromium.org/487533005
Cr-Commit-Position: refs/heads/master@{#292567}
Diffstat (limited to 'build')
| -rw-r--r-- | build/json_schema_bundle_compile.gypi | 7 | ||||
| -rw-r--r-- | build/json_schema_compile.gypi | 8 |
2 files changed, 15 insertions, 0 deletions
diff --git a/build/json_schema_bundle_compile.gypi b/build/json_schema_bundle_compile.gypi index 7560bdc..a302013 100644 --- a/build/json_schema_bundle_compile.gypi +++ b/build/json_schema_bundle_compile.gypi @@ -7,6 +7,11 @@ # When including this gypi, the following variables must be set: # schema_files: # An array of json or idl files that comprise the api model. + # schema_include_rules (optional): + # An array of paths to include when searching for referenced objects, + # with the namespace separated by a :. + # Example: + # [ '/foo/bar:Foo::Bar::%(namespace)s' ] # cc_dir: # The directory to put the generated code in. # root_namespace: @@ -32,6 +37,7 @@ '<(api_gen_dir)/model.py', '<(api_gen_dir)/util_cc_helper.py', ], + 'schema_include_rules': [], }, 'actions': [ { @@ -52,6 +58,7 @@ '--destdir=<(SHARED_INTERMEDIATE_DIR)', '--namespace=<(root_namespace)', '--generator=cpp-bundle-schema', + '--include-rules=<(schema_include_rules)', '<@(schema_files)', '<@(non_compiled_schema_files)', ], diff --git a/build/json_schema_compile.gypi b/build/json_schema_compile.gypi index 9672f79..9952e20 100644 --- a/build/json_schema_compile.gypi +++ b/build/json_schema_compile.gypi @@ -7,6 +7,11 @@ # When including this gypi, the following variables must be set: # schema_files: # An array of json or idl files that comprise the api model. + # schema_include_rules (optional): + # An array of paths to include when searching for referenced objects, + # with the namespace separated by a :. + # Example: + # [ '/foo/bar:Foo::Bar::%(namespace)s' ] # cc_dir: # The directory to put the generated code in. # root_namespace: @@ -17,6 +22,7 @@ # Functions and namespaces can be excluded by setting "nocompile" to true. 'api_gen_dir': '<(DEPTH)/tools/json_schema_compiler', 'api_gen': '<(api_gen_dir)/compiler.py', + 'schema_include_rules': [], }, 'rules': [ { @@ -54,6 +60,7 @@ '--destdir=<(SHARED_INTERMEDIATE_DIR)', '--namespace=<(root_namespace)', '--generator=cpp', + '--include-rules=<(schema_include_rules)' ], 'message': 'Generating C++ code from <(RULE_INPUT_PATH) json files', 'process_outputs_as_sources': 1, @@ -92,6 +99,7 @@ '--destdir=<(SHARED_INTERMEDIATE_DIR)', '--namespace=<(root_namespace)', '--generator=cpp', + '--include-rules=<(schema_include_rules)' ], 'message': 'Generating C++ code from <(RULE_INPUT_PATH) IDL files', 'process_outputs_as_sources': 1, |