Revert "Split bundle generation steps so that API registration is generated in browser, not common."

extensions/common/api/api.gyp

Index: extensions/common/api/api.gyp
diff --git a/extensions/common/api/api.gyp b/extensions/common/api/api.gyp
index f66baef32a9b677eeaf8b6f1f95d88de6f322cce..c95217cae0861ef01e3b149ca99a37d7919e71b0 100644
--- a/extensions/common/api/api.gyp
+++ b/extensions/common/api/api.gyp
@@ -8,12 +8,59 @@
       # GN version: //extensions/common/api
       'target_name': 'extensions_api',
       'type': 'static_library',
+      'sources': [
+        '<@(schema_files)',
+      ],
       # TODO(jschuh): http://crbug.com/167187 size_t -> int
       'msvs_disabled_warnings': [ 4267 ],
       'includes': [
         '../../../build/json_schema_bundle_compile.gypi',
         '../../../build/json_schema_compile.gypi',
-        'schemas.gypi',
+      ],
+      'variables': {
+        'chromium_code': 1,
+        'non_compiled_schema_files': [
+        ],
+        'conditions': [
+          ['enable_extensions==1', {
+            # Note: file list duplicated in GN build.
+            'schema_files': [
+              'app_runtime.idl',
+              'app_view_internal.json',
+              'cast_channel.idl',
+              'dns.idl',
+              'extensions_manifest_types.json',
+              'hid.idl',
+              'power.idl',
+              'runtime.json',
+              'serial.idl',
+              'socket.idl',
+              'sockets_tcp.idl',
+              'sockets_tcp_server.idl',
+              'sockets_udp.idl',
+              'storage.json',
+              'test.json',
+              'usb.idl',
+              'usb_private.idl',
+            ],
+          }, {
+            # TODO: Eliminate these on Android. See crbug.com/305852.
+            'schema_files': [
+              'runtime.json',
+            ],
+          }],
+        ],
+        'cc_dir': 'extensions/common/api',
+        'root_namespace': 'extensions::core_api::%(namespace)s',
+        'impl_dir': 'extensions/browser/api',
+      },
+      'conditions': [
+        ['enable_extensions==1', {
+          'dependencies': [
+            '<(DEPTH)/device/serial/serial.gyp:device_serial',
+            '<(DEPTH)/skia/skia.gyp:skia',
+          ],
+        }],
       ],
     },
   ],