Revert of Cleanup: Remove remaining generated extensions APIs on Android.

chrome/common/extensions/api/schemas.gypi

 # 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.
 
 {
   'sources': [
     '<@(schema_files)',
   ],
   'variables': {
+    # These duplicate other lists and are the only ones used on Android. They
+    # should be eliminated. See crbug.com/305852.
+    'android_schema_files': [
+      'manifest_types.json',
+    ],
+
+    # These are used everywhere except Android.
     'main_schema_files': [
       'accessibility_private.json',
       'activity_log_private.json',
       'alarms.idl',
       'audio.idl',
       'automation.idl',
       'automation_internal.idl',
       'autotest_private.idl',
       'bookmark_manager_private.json',
       'bookmarks.json',
@@ skipping 108 matching lines @@
     'webrtc_schema_files': [
       'cast_streaming_rtp_stream.idl',
       'cast_streaming_session.idl',
       'cast_streaming_udp_transport.idl',
     ],
 
     'chromium_code': 1,
     # Disable schema compiler to generate model extension API code.
     # Only register the extension functions in extension system.
     'conditions': [
-      # TODO(thestig): Remove this file from non-extensions build so the
-      # conditional and else branch goes away.
-      # Do the same for chrome/common/extensions/api/schemas.gni.
       ['enable_extensions==1', {
         'non_compiled_schema_files': [
           '<@(main_non_compiled_schema_files)',
         ],
         'schema_dependencies': [
           '<(DEPTH)/extensions/common/api/api.gyp:extensions_api',
         ],
         'schema_files': [
           '<@(main_schema_files)',
         ],
         'schema_include_rules': [
           '<@(main_schema_include_rules)',
         ],
       }, {  # enable_extensions==0
         'non_compiled_schema_files': [
         ],
         'schema_dependencies': [
         ],
         'schema_files': [
+          # These should be eliminated. See crbug.com/305852.
+          '<@(android_schema_files)',
         ],
       }],
       ['chromeos==1', {
         'schema_files': [
           '<@(chromeos_schema_files)',
         ],
       }],
       ['enable_extensions==1 and enable_webrtc==1', {
         'schema_files': [
           '<@(webrtc_schema_files)',
         ],
       }],
     ],
     'cc_dir': 'chrome/common/extensions/api',
     'root_namespace': 'extensions::api::%(namespace)s',
     'impl_dir_': 'chrome/browser/extensions/api',
   },
 }