From 2fe86eec05c9a608e3737cca1de4dd6d7e5c1301 Mon Sep 17 00:00:00 2001 From: "asargent@chromium.org" Date: Wed, 21 Mar 2012 05:40:14 +0000 Subject: Remove dependence on .json files for IDL-specified extensions/apps APIs This is an incremental step towards fully IDL-specified API bindings. This patch adds code which generates JSON based on IDL for the purpose of exposing bindings to javascript. BUG=119137 TEST=Code should compile and existing tests should pass. Review URL: http://codereview.chromium.org/9774001 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127908 0039d316-1c4b-4281-b951-d872f2087c98 --- build/json_schema_bundle_compile.gypi | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'build/json_schema_bundle_compile.gypi') diff --git a/build/json_schema_bundle_compile.gypi b/build/json_schema_bundle_compile.gypi index 1f564d1..ecefe41 100644 --- a/build/json_schema_bundle_compile.gypi +++ b/build/json_schema_bundle_compile.gypi @@ -5,7 +5,7 @@ { 'variables': { # When including this gypi, the following variables must be set: - # json_schema_files: an array of json files that comprise the api model. + # idl_schema_files: an array of idl files that comprise the api model. # cc_dir: path to generated files # root_namespace: the C++ namespace that all generated files go under # Functions and namespaces can be excluded by setting "nocompile" to true. @@ -16,24 +16,23 @@ { 'action_name': 'genapi_bundle', 'inputs': [ - '<(api_gen_dir)/any.cc', - '<(api_gen_dir)/any.h', - '<(api_gen_dir)/any_helper.py', '<(api_gen_dir)/cc_generator.py', '<(api_gen_dir)/code.py', '<(api_gen_dir)/compiler.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', - '<(api_gen_dir)/util.h', + '<(api_gen_dir)/schema_bundle_generator.py', '<(api_gen_dir)/util_cc_helper.py', '<@(idl_schema_files)', ], 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/chrome/common/extensions/api/generated_api.h', + '<(SHARED_INTERMEDIATE_DIR)/<(cc_dir)/generated_api.h', + '<(SHARED_INTERMEDIATE_DIR)/<(cc_dir)/generated_schemas.h', + '<(SHARED_INTERMEDIATE_DIR)/<(cc_dir)/generated_schemas.cc', ], 'action': [ 'python', @@ -52,9 +51,6 @@ '<(SHARED_INTERMEDIATE_DIR)', '<(DEPTH)', ], - 'dependencies':[ - '<(DEPTH)/tools/json_schema_compiler/api_gen_util.gyp:api_gen_util', - ], 'direct_dependent_settings': { 'include_dirs': [ '<(SHARED_INTERMEDIATE_DIR)', -- cgit v1.1