Reland 596ff54335b2a1b393af10657bc4945114f3beed - Split API bundle generation steps

build/json_schema_bundle_registration_compile.gypi

Index: build/json_schema_bundle_registration_compile.gypi
diff --git a/build/json_schema_bundle_compile.gypi b/build/json_schema_bundle_registration_compile.gypi
similarity index 55%
copy from build/json_schema_bundle_compile.gypi
copy to build/json_schema_bundle_registration_compile.gypi
index 7e712d7df49e45931305256e7342f98b02d3780e..5a013bcf707c02cb6c6c90550fadb5ae4221abc6 100644
--- a/build/json_schema_bundle_compile.gypi
+++ b/build/json_schema_bundle_registration_compile.gypi
@@ -1,4 +1,4 @@
-# Copyright (c) 2012 The Chromium Authors. All rights reserved.
+# Copyright 2014 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -7,44 +7,44 @@
     # When including this gypi, the following variables must be set:
     #   schema_files:
     #     An array of json or idl files that comprise the api model.
-    #   cc_dir:
-    #     The directory to put the generated code in.
+    #   impl_dir_:
+    #     The root path of API implementations; also used for the
+    #     output location. (N.B. Named as such to prevent gyp from
+    #     expanding it as a relative path.)
     #   root_namespace:
     #     A Python string substituion pattern used to generate the C++
     #     namespace for each API. Use %(namespace)s to replace with the API
     #     namespace, like "toplevel::%(namespace)s_api".
     #
     # Functions and namespaces can be excluded by setting "nocompile" to true.
-    # The default root path of API implementation sources is
-    # 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_registration',
       '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',
+        '<(SHARED_INTERMEDIATE_DIR)/<(impl_dir_)/generated_api_registration.h',
+        '<(SHARED_INTERMEDIATE_DIR)/<(impl_dir_)/generated_api_registration.cc',
       ],
       'action': [
         'python',
@@ -52,14 +52,16 @@
         '--root=<(DEPTH)',
         '--destdir=<(SHARED_INTERMEDIATE_DIR)',
         '--namespace=<(root_namespace)',
-        '--generator=cpp-bundle',
-        '--impl-dir=<(impl_dir)',
+        '--generator=cpp-bundle-registration',
+        '--impl-dir=<(impl_dir_)',
         '<@(schema_files)',
         '<@(non_compiled_schema_files)',
       ],
-      'message': 'Generating C++ API bundle code',
+      'message': 'Generating C++ API bundle code for function registration',
       'process_outputs_as_sources': 1,
-    }
+      # Avoid running MIDL compiler on IDL input files.
+      'explicit_idl_action': 1,
+    },
   ],
   'include_dirs': [
     '<(SHARED_INTERMEDIATE_DIR)',