Revert revision 176015

chrome/common/extensions/api/api.gyp

Index: chrome/common/extensions/api/api.gyp
===================================================================
--- chrome/common/extensions/api/api.gyp	(revision 176052)
+++ chrome/common/extensions/api/api.gyp	(working copy)
@@ -8,7 +8,8 @@
       'target_name': 'api',
       'type': 'static_library',
       'sources': [
-        '<@(schema_files)',
+        '<@(idl_schema_files)',
+        '<@(json_schema_files)',
       ],
       'includes': [
         '../../../../build/json_schema_bundle_compile.gypi',
@@ -16,71 +17,75 @@
       ],
       'variables': {
         'chromium_code': 1,
-        'schema_files': [
+        'json_schema_files': [
+          'bookmarks.json',
+          'cloud_print_private.json',
+          'content_settings.json',
+          'context_menus.json',
+          'cookies.json',
+          'debugger.json',
+          'events.json',
+          'experimental_history.json',
+          'experimental_record.json',
+          'file_browser_handler_internal.json',
+          'i18n.json',
+          'font_settings.json',
+          'history.json',
+          'management.json',
+          'page_capture.json',
+          'permissions.json',
+          'storage.json',
+          'tabs.json',
+          'web_navigation.json',
+          'web_request.json',
+          'windows.json',
+        ],
+        'idl_schema_files': [
           'alarms.idl',
           'app_current_window_internal.idl',
           'app_runtime.idl',
           'app_window.idl',
           'autotest_private.idl',
           'bluetooth.idl',
-          'bookmarks.json',
-          'cloud_print_private.json',
-          'content_settings.json',
-          'context_menus.json',
-          'cookies.json',
-          'debugger.json',
           'developer_private.idl',
           'dial.idl',
           'downloads.idl',
-          'events.json',
           'experimental_discovery.idl',
           'experimental_dns.idl',
-          'experimental_history.json',
           'experimental_identity.idl',
           'experimental_idltest.idl',
           'experimental_media_galleries.idl',
           'experimental_notification.idl',
-          'experimental_record.json',
           'experimental_system_info_cpu.idl',
           'experimental_system_info_display.idl',
           'experimental_system_info_memory.idl',
           'experimental_system_info_storage.idl',
-          'file_browser_handler_internal.json',
           'file_system.idl',
-          'font_settings.json',
-          'history.json',
-          'i18n.json',
-          'management.json',
           'media_galleries.idl',
           'media_galleries_private.idl',
-          'page_capture.json',
-          'permissions.json',
           'push_messaging.idl',
           'rtc_private.idl',
           'serial.idl',
           'socket.idl',
-          'storage.json',
           'sync_file_system.idl',
           'system_indicator.idl',
           'tab_capture.idl',
-          'tabs.json',
           'usb.idl',
-          'web_navigation.json',
-          'web_request.json',
-          'windows.json',
         ],
         'cc_dir': 'chrome/common/extensions/api',
         'root_namespace': 'extensions::api',
       },
       'conditions': [
         ['OS=="android"', {
-          'schema_files!': [
+          'idl_schema_files!': [
             'usb.idl',
           ],
         }],
         ['OS!="chromeos"', {
-          'schema_files!': [
+          'json_schema_files!': [
             'file_browser_handler_internal.json',
+          ],
+          'idl_schema_files!': [
             'rtc_private.idl',
           ],
         }],