Revert of Exclude some extension apis for Aura Android

chrome/chrome_browser_extensions.gypi

 # Copyright (c) 2013 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.
 
 {
   'variables': {
     'chrome_browser_extensions_chromeos_sources': [
       'browser/extensions/api/cast_devices_private/cast_devices_private_api.cc',
       'browser/extensions/api/cast_devices_private/cast_devices_private_api.h',
       'browser/extensions/api/certificate_provider/certificate_provider_api.cc',
@@ skipping 50 matching lines @@
       'browser/extensions/api/image_writer_private/operation_nonchromeos.cc',
       'browser/extensions/api/image_writer_private/removable_storage_provider_linux.cc',
       'browser/extensions/api/messaging/native_message_process_host.cc',
       'browser/extensions/api/messaging/native_message_process_host.h',
       'browser/extensions/api/messaging/native_process_launcher.cc',
       'browser/extensions/api/messaging/native_process_launcher.h',
       'browser/extensions/api/messaging/native_process_launcher_android.cc',
       'browser/extensions/api/messaging/native_process_launcher_posix.cc',
       'browser/extensions/api/messaging/native_process_launcher_win.cc',
     ],
-    'chrome_browser_extensions_non_android_sources': [
-      'browser/extensions/api/gcd_private/gcd_private_api.cc',
-      'browser/extensions/api/gcd_private/gcd_private_api.h',
-      'browser/extensions/api/gcd_private/privet_v3_context_getter.cc',
-      'browser/extensions/api/gcd_private/privet_v3_context_getter.h',
-      'browser/extensions/api/gcd_private/privet_v3_session.cc',
-      'browser/extensions/api/gcd_private/privet_v3_session.h',
-      'browser/extensions/api/launcher_page/launcher_page_api.cc',
-      'browser/extensions/api/launcher_page/launcher_page_api.h',
-      'browser/extensions/api/mdns/dns_sd_delegate.cc',
-      'browser/extensions/api/mdns/dns_sd_delegate.h',
-      'browser/extensions/api/mdns/dns_sd_device_lister.cc',
-      'browser/extensions/api/mdns/dns_sd_device_lister.h',
-      'browser/extensions/api/mdns/dns_sd_registry.cc',
-      'browser/extensions/api/mdns/dns_sd_registry.h',
-      'browser/extensions/api/mdns/mdns_api.cc',
-      'browser/extensions/api/mdns/mdns_api.h',
-    ],
     'chrome_browser_extensions_enabled_sources': [
       'browser/apps/app_launch_for_metro_restart_win.cc',
       'browser/apps/app_launch_for_metro_restart_win.h',
       'browser/apps/app_url_redirector.cc',
       'browser/apps/app_url_redirector.h',
       'browser/apps/app_window_registry_util.cc',
       'browser/apps/app_window_registry_util.h',
       'browser/apps/ephemeral_app_service.cc',
       'browser/apps/ephemeral_app_service.h',
       'browser/apps/ephemeral_app_service_factory.cc',
@@ skipping 204 matching lines @@
       'browser/extensions/api/feedback_private/feedback_service.cc',
       'browser/extensions/api/feedback_private/feedback_service.h',
       'browser/extensions/api/file_handlers/app_file_handler_util.cc',
       'browser/extensions/api/file_handlers/app_file_handler_util.h',
       'browser/extensions/api/file_handlers/mime_util.cc',
       'browser/extensions/api/file_handlers/mime_util.h',
       'browser/extensions/api/file_system/file_system_api.cc',
       'browser/extensions/api/file_system/file_system_api.h',
       'browser/extensions/api/font_settings/font_settings_api.cc',
       'browser/extensions/api/font_settings/font_settings_api.h',
+      'browser/extensions/api/gcd_private/gcd_private_api.cc',
+      'browser/extensions/api/gcd_private/gcd_private_api.h',
+      'browser/extensions/api/gcd_private/privet_v3_context_getter.cc',
+      'browser/extensions/api/gcd_private/privet_v3_context_getter.h',
+      'browser/extensions/api/gcd_private/privet_v3_session.cc',
+      'browser/extensions/api/gcd_private/privet_v3_session.h',
       'browser/extensions/api/gcm/gcm_api.cc',
       'browser/extensions/api/gcm/gcm_api.h',
       'browser/extensions/api/history/history_api.cc',
       'browser/extensions/api/history/history_api.h',
       'browser/extensions/api/hotword_private/hotword_private_api.cc',
       'browser/extensions/api/hotword_private/hotword_private_api.h',
       'browser/extensions/api/i18n/i18n_api.cc',
       'browser/extensions/api/i18n/i18n_api.h',
       'browser/extensions/api/identity/extension_token_key.cc',
       'browser/extensions/api/identity/extension_token_key.h',
@@ skipping 34 matching lines @@
       'browser/extensions/api/inline_install_private/inline_install_private_api.cc',
       'browser/extensions/api/inline_install_private/inline_install_private_api.h',
       'browser/extensions/api/instance_id/instance_id_api.cc',
       'browser/extensions/api/instance_id/instance_id_api.h',
       'browser/extensions/api/language_settings_private/language_settings_private_api.cc',
       'browser/extensions/api/language_settings_private/language_settings_private_api.h',
       'browser/extensions/api/language_settings_private/language_settings_private_delegate.cc',
       'browser/extensions/api/language_settings_private/language_settings_private_delegate.h',
       'browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.cc',
       'browser/extensions/api/language_settings_private/language_settings_private_delegate_factory.h',
+      'browser/extensions/api/launcher_page/launcher_page_api.cc',
+      'browser/extensions/api/launcher_page/launcher_page_api.h',
       'browser/extensions/api/location/location_api.cc',
       'browser/extensions/api/location/location_api.h',
       'browser/extensions/api/location/location_manager.cc',
       'browser/extensions/api/location/location_manager.h',
       'browser/extensions/api/management/chrome_management_api_delegate.cc',
       'browser/extensions/api/management/chrome_management_api_delegate.h',
+      'browser/extensions/api/mdns/dns_sd_delegate.cc',
+      'browser/extensions/api/mdns/dns_sd_delegate.h',
+      'browser/extensions/api/mdns/dns_sd_device_lister.cc',
+      'browser/extensions/api/mdns/dns_sd_device_lister.h',
+      'browser/extensions/api/mdns/dns_sd_registry.cc',
+      'browser/extensions/api/mdns/dns_sd_registry.h',
+      'browser/extensions/api/mdns/mdns_api.cc',
+      'browser/extensions/api/mdns/mdns_api.h',
       'browser/extensions/api/media_galleries/media_galleries_api.cc',
       'browser/extensions/api/media_galleries/media_galleries_api.h',
       'browser/extensions/api/messaging/extension_message_port.cc',
       'browser/extensions/api/messaging/extension_message_port.h',
       'browser/extensions/api/messaging/incognito_connectability.cc',
       'browser/extensions/api/messaging/incognito_connectability.h',
       'browser/extensions/api/messaging/message_property_provider.cc',
       'browser/extensions/api/messaging/message_property_provider.h',
       'browser/extensions/api/messaging/message_service.cc',
       'browser/extensions/api/messaging/message_service.h',
@@ skipping 649 matching lines @@
           'sources': [
             '<@(chrome_browser_extensions_chromeos_sources)',
           ],
         }, {  # chromeos==0
           'sources': [
             'browser/extensions/default_apps.cc',
             'browser/extensions/default_apps.h',
             '<@(chrome_browser_extensions_non_chromeos_sources)',
           ],
         }],
-        ['OS!="android"', {
-          'sources': [
-            '<@(chrome_browser_extensions_non_android_sources)',
-          ],
-        }],
         ['use_ash==1', {
           'sources': [
             'browser/extensions/api/tabs/ash_panel_contents.cc',
             'browser/extensions/api/tabs/ash_panel_contents.h',
           ],
         }],
         ['use_aura==1', {
           'dependencies': [
             '../ui/keyboard/keyboard.gyp:keyboard',
             '../ui/keyboard/keyboard.gyp:keyboard_with_content',
@@ skipping 103 matching lines @@
           ],
         }, {  # use_brlapi==0
           'sources': [
             'browser/extensions/api/braille_display_private/braille_controller_stub.cc',
           ],
         }],
       ],
     },
   ],
 }