Exclude more files from Android build

These files are not used on Android but were unnecessarily compiled.
They didn't affect binary size because they were removed during linker GC,
but excluding them may save build time, and help future modular exclusion.

BUG=none
TBR=ben,kbr,brettw,jar  (An Android only change to gyps)


Review URL: https://chromiumcodereview.appspot.com/10823291

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@151529 0039d316-1c4b-4281-b951-d872f2087c98

10 files changed, 91 insertions, 68 deletions

diff --git a/base/base.gypi b/base/base.gypi
index dae1669..79b5ead 100644
--- a/base/base.gypi
+++ b/base/base.gypi
@@ -574,6 +574,7 @@
           }],
           ['OS == "android" and >(nacl_untrusted_build)==0', {
             'sources!': [
+              'base_paths_posix.cc',
               'files/file_path_watcher_kqueue.cc',
               'system_monitor/system_monitor_posix.cc',
             ],
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 1728220..0d0ec7c 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4516,6 +4516,7 @@
         }, {  # safe_browsing==0
           'dependencies!': [
             'safe_browsing_report_proto',
+            '../third_party/libusb/libusb.gyp:libusb',
           ],
           'sources!': [
             'browser/renderer_host/safe_browsing_resource_throttle.cc',
@@ -4982,7 +4983,9 @@
             'browser/page_cycler/page_cycler.cc',
             'browser/page_cycler/page_cycler.h',
             'browser/ui/browser.cc',
+            'browser/ui/browser_command_controller.cc',
             'browser/ui/browser_finder.cc',
+            'browser/ui/browser_instant_controller.cc',
             'browser/ui/browser_list.cc',
             'browser/ui/browser_navigator.cc',
             'browser/ui/browser_otr_state.cc',
@@ -5021,7 +5024,14 @@
           'sources/': [
             ['exclude', '^browser/captive_portal/'],
             ['exclude', '^browser/chrome_to_mobile'],
+            ['exclude', '^browser/first_run/'],
+            ['include', '^browser/first_run/first_run.cc'], # For ctor/dtor of a struct.
             ['exclude', '^browser/importer/'],
+            ['exclude', '^browser/lifetime/'],
+            ['exclude', '^browser/service/'],
+            ['exclude', '^browser/speech/'],
+            ['exclude', '^browser/sync/glue/app_'],
+            ['exclude', '^browser/sync/glue/extension_'],
             ['exclude', '^browser/ui/intents/'],
             ['exclude', '^browser/ui/omnibox/'],
             ['exclude', '^browser/ui/panels/'],
diff --git a/chrome/chrome_browser_extensions.gypi b/chrome/chrome_browser_extensions.gypi
index 62b697e..c7fea02 100644
--- a/chrome/chrome_browser_extensions.gypi
+++ b/chrome/chrome_browser_extensions.gypi
@@ -82,6 +82,8 @@
         'browser/extensions/api/bluetooth/bluetooth_api_utils.h',
         'browser/extensions/api/browsing_data/browsing_data_api.cc',
         'browser/extensions/api/browsing_data/browsing_data_api.h',
+        'browser/extensions/api/cloud_print_private/cloud_print_private_api.cc',
+        'browser/extensions/api/cloud_print_private/cloud_print_private_api.h',
         'browser/extensions/api/content_settings/content_settings_api.cc',
         'browser/extensions/api/content_settings/content_settings_api.h',
         'browser/extensions/api/content_settings/content_settings_api_constants.cc',
@@ -102,6 +104,8 @@
         'browser/extensions/api/cookies/cookies_api_constants.h',
         'browser/extensions/api/cookies/cookies_helpers.cc',
         'browser/extensions/api/cookies/cookies_helpers.h',
+        'browser/extensions/api/debugger/debugger_api.cc',
+        'browser/extensions/api/debugger/debugger_api.h',
         'browser/extensions/api/debugger/debugger_api_constants.cc',
         'browser/extensions/api/debugger/debugger_api_constants.h',
         'browser/extensions/api/declarative/declarative_api.cc',
@@ -156,6 +160,12 @@
         'browser/extensions/api/extension_action/extension_script_badge_api.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/i18n/i18n_api.cc',
+        'browser/extensions/api/i18n/i18n_api.h',
+        'browser/extensions/api/idle/idle_api.cc',
+        'browser/extensions/api/idle/idle_api.h',
         'browser/extensions/api/idle/idle_api_constants.cc',
         'browser/extensions/api/idle/idle_api_constants.h',
         'browser/extensions/api/idltest/idltest_api.cc',
@@ -164,16 +174,26 @@
         'browser/extensions/api/identity/identity_api.h',
         'browser/extensions/api/identity/web_auth_flow.cc',
         'browser/extensions/api/identity/web_auth_flow.h',
+        'browser/extensions/api/input_ime/input_ime_api.cc',
+        'browser/extensions/api/input_ime/input_ime_api.h',
+        'browser/extensions/api/managed_mode/managed_mode_api.cc',
+        'browser/extensions/api/managed_mode/managed_mode_api.h',
+        'browser/extensions/api/management/management_api.cc',
+        'browser/extensions/api/management/management_api.h',
         'browser/extensions/api/management/management_api_constants.cc',
         'browser/extensions/api/management/management_api_constants.h',
         'browser/extensions/api/media_galleries/media_galleries_api.cc',
         'browser/extensions/api/media_galleries/media_galleries_api.h',
+        'browser/extensions/api/metrics/metrics.cc',
+        'browser/extensions/api/metrics/metrics.h',
         'browser/extensions/api/offscreen_tabs/offscreen_tabs_api.cc',
         'browser/extensions/api/offscreen_tabs/offscreen_tabs_api.h',
         'browser/extensions/api/offscreen_tabs/offscreen_tabs_constants.cc',
         'browser/extensions/api/offscreen_tabs/offscreen_tabs_constants.h',
         'browser/extensions/api/omnibox/omnibox_api.cc',
         'browser/extensions/api/omnibox/omnibox_api.h',
+        'browser/extensions/api/page_capture/page_capture_api.cc',
+        'browser/extensions/api/page_capture/page_capture_api.h',
         'browser/extensions/api/permissions/permissions_api.cc',
         'browser/extensions/api/permissions/permissions_api.h',
         'browser/extensions/api/permissions/permissions_api_helpers.cc',
@@ -212,12 +232,18 @@
         'browser/extensions/api/system_info_cpu/cpu_info_provider.h',
         'browser/extensions/api/system_info_cpu/system_info_cpu_api.cc',
         'browser/extensions/api/system_info_cpu/system_info_cpu_api.h',
+        'browser/extensions/api/tabs/execute_code_in_tab_function.cc',
+        'browser/extensions/api/tabs/execute_code_in_tab_function.h',
+        'browser/extensions/api/tabs/tabs.cc',
+        'browser/extensions/api/tabs/tabs.h',
         'browser/extensions/api/tabs/tabs_constants.cc',
         'browser/extensions/api/tabs/tabs_constants.h',
         'browser/extensions/api/terminal/terminal_extension_helper.cc',
         'browser/extensions/api/terminal/terminal_extension_helper.h',
         'browser/extensions/api/terminal/terminal_private_api.cc',
         'browser/extensions/api/terminal/terminal_private_api.h',
+        'browser/extensions/api/test/test_api.cc',
+        'browser/extensions/api/test/test_api.h',
         'browser/extensions/api/usb/usb_api.cc',
         'browser/extensions/api/usb/usb_api.h',
         'browser/extensions/api/usb/usb_device_resource.cc',
@@ -240,6 +266,10 @@
         'browser/extensions/api/web_request/web_request_permissions.h',
         'browser/extensions/api/web_request/web_request_time_tracker.cc',
         'browser/extensions/api/web_request/web_request_time_tracker.h',
+        'browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc',
+        'browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.h',
+        'browser/extensions/api/webstore_private/webstore_private_api.cc',
+        'browser/extensions/api/webstore_private/webstore_private_api.h',
         'browser/extensions/app_notification.cc',
         'browser/extensions/app_notification.h',
         'browser/extensions/app_notification_manager.cc',
@@ -337,6 +367,10 @@
         'browser/extensions/extension_info_private_api_chromeos.h',
         'browser/extensions/extension_infobar_delegate.cc',
         'browser/extensions/extension_infobar_delegate.h',
+        'browser/extensions/extension_input_api.cc',
+        'browser/extensions/extension_input_api.h',
+        'browser/extensions/extension_input_method_api.cc',
+        'browser/extensions/extension_input_method_api.h',
         'browser/extensions/extension_input_module_constants.cc',
         'browser/extensions/extension_input_module_constants.h',
         'browser/extensions/extension_install_dialog.cc',
@@ -359,6 +393,8 @@
         'browser/extensions/extension_pref_value_map.h',
         'browser/extensions/extension_pref_value_map_factory.cc',
         'browser/extensions/extension_pref_value_map_factory.h',
+        'browser/extensions/extension_preference_api.cc',
+        'browser/extensions/extension_preference_api.h',
         'browser/extensions/extension_preference_api_constants.cc',
         'browser/extensions/extension_preference_api_constants.h',
         'browser/extensions/extension_preference_helpers.cc',
@@ -443,14 +479,14 @@
         'browser/extensions/pack_extension_job.h',
         'browser/extensions/page_action_controller.cc',
         'browser/extensions/page_action_controller.h',
-        'browser/extensions/platform_app_launcher.cc',
-        'browser/extensions/platform_app_launcher.h',
         'browser/extensions/pending_extension_info.cc',
         'browser/extensions/pending_extension_info.h',
         'browser/extensions/pending_extension_manager.cc',
         'browser/extensions/pending_extension_manager.h',
         'browser/extensions/permissions_updater.cc',
         'browser/extensions/permissions_updater.h',
+        'browser/extensions/platform_app_launcher.cc',
+        'browser/extensions/platform_app_launcher.h',
         'browser/extensions/process_map.cc',
         'browser/extensions/process_map.h',
         'browser/extensions/sandboxed_unpacker.cc',
@@ -465,6 +501,8 @@
         'browser/extensions/settings/managed_value_store_cache.h',
         'browser/extensions/settings/setting_sync_data.cc',
         'browser/extensions/settings/setting_sync_data.h',
+        'browser/extensions/settings/settings_api.cc',
+        'browser/extensions/settings/settings_api.h',
         'browser/extensions/settings/settings_backend.cc',
         'browser/extensions/settings/settings_backend.h',
         'browser/extensions/settings/settings_frontend.cc',
@@ -491,6 +529,8 @@
         'browser/extensions/shell_window_registry.h',
         'browser/extensions/state_store.cc',
         'browser/extensions/state_store.h',
+        'browser/extensions/system/system_api.cc',
+        'browser/extensions/system/system_api.h',
         'browser/extensions/tab_helper.cc',
         'browser/extensions/tab_helper.h',
         'browser/extensions/theme_installed_infobar_delegate.cc',
@@ -549,56 +589,14 @@
             'browser/extensions/default_apps.h',
           ],
         }],
-        ['enable_extensions==1', {
-          'sources': [
-            'browser/extensions/api/idle/idle_api.cc',
-            'browser/extensions/api/idle/idle_api.h',
-            'browser/extensions/api/cloud_print_private/cloud_print_private_api.cc',
-            'browser/extensions/api/cloud_print_private/cloud_print_private_api.h',
-            'browser/extensions/api/page_capture/page_capture_api.cc',
-            'browser/extensions/api/page_capture/page_capture_api.h',
-            'browser/extensions/api/debugger/debugger_api.cc',
-            'browser/extensions/api/debugger/debugger_api.h',
-            'browser/extensions/api/font_settings/font_settings_api.cc',
-            'browser/extensions/api/font_settings/font_settings_api.h',
-            'browser/extensions/api/i18n/i18n_api.cc',
-            'browser/extensions/api/i18n/i18n_api.h',
-            'browser/extensions/api/input_ime/input_ime_api.cc',
-            'browser/extensions/api/input_ime/input_ime_api.h',
-            'browser/extensions/api/managed_mode/managed_mode_api.cc',
-            'browser/extensions/api/managed_mode/managed_mode_api.h',
-            'browser/extensions/api/management/management_api.cc',
-            'browser/extensions/api/management/management_api.h',
-            'browser/extensions/api/metrics/metrics.cc',
-            'browser/extensions/api/metrics/metrics.h',
-            'browser/extensions/api/tabs/execute_code_in_tab_function.cc',
-            'browser/extensions/api/tabs/execute_code_in_tab_function.h',
-            'browser/extensions/api/tabs/tabs.cc',
-            'browser/extensions/api/tabs/tabs.h',
-            'browser/extensions/api/test/test_api.cc',
-            'browser/extensions/api/test/test_api.h',
-            'browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.cc',
-            'browser/extensions/api/web_socket_proxy_private/web_socket_proxy_private_api.h',
-            'browser/extensions/api/webstore_private/webstore_private_api.cc',
-            'browser/extensions/api/webstore_private/webstore_private_api.h',
-            'browser/extensions/extension_input_api.cc',
-            'browser/extensions/extension_input_api.h',
-            'browser/extensions/extension_input_method_api.cc',
-            'browser/extensions/extension_input_method_api.h',
-            'browser/extensions/extension_preference_api.cc',
-            'browser/extensions/extension_preference_api.h',
-            'browser/extensions/settings/settings_api.cc',
-            'browser/extensions/settings/settings_api.h',
-            'browser/extensions/system/system_api.cc',
-            'browser/extensions/system/system_api.h',
-          ],
-        }, {  # enable_extensions==0
+        ['enable_extensions==0', {
           'sources/': [
             # Handle files in browser/extensions/api. Exclude everything by default, white list
             # files if they are needed for linking.
             # TODO: The re-includes should go away or shrink as extensions are refactored to be
             # less intertwined in the main codebase.
             ['exclude', '^browser/extensions/api/'],
+            ['exclude', '^browser/extensions/.*_api\.cc$'],
             ['include', '^browser/extensions/api/alarms/alarm_manager.cc'],
             ['include', '^browser/extensions/api/content_settings/content_settings_api_constants.cc'],
             ['include', '^browser/extensions/api/content_settings/content_settings_helpers.cc'],
@@ -633,6 +631,10 @@
             ['include', '^browser/extensions/api/web_request/web_request_api_helpers.cc'],
             ['include', '^browser/extensions/api/web_request/web_request_permissions.cc'],
             ['include', '^browser/extensions/api/web_request/web_request_time_tracker.cc'],
+            ['include', '^browser/extensions/extension_processes_api.cc'],
+          ],
+          'dependencies!': [
+            '../third_party/libusb/libusb.gyp:libusb',
           ],
         }],
         ['OS=="linux" and use_aura==1', {
@@ -722,10 +724,6 @@
             'browser/extensions/extension_tab_util_android.cc',
           ],
           'sources!': [
-            'browser/extensions/api/usb/usb_api.cc',
-            'browser/extensions/api/usb/usb_api.h',
-            'browser/extensions/api/usb/usb_device_resource.cc',
-            'browser/extensions/api/usb/usb_device_resource.h',
             'browser/extensions/app_notify_channel_ui_impl.cc',
             'browser/extensions/app_notify_channel_ui_impl.h',
             'browser/extensions/extension_error_ui_default.cc',
diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi
index 5948e18..8432748 100644
--- a/chrome/chrome_tests.gypi
+++ b/chrome/chrome_tests.gypi
@@ -2458,6 +2458,12 @@
           'sources/': [
             ['exclude', '^browser/captive_portal/'],
             ['exclude', '^browser/chrome_to_mobile'],
+            ['exclude', '^browser/first_run/'],
+            ['exclude', '^browser/importer/'],
+            ['exclude', '^browser/lifetime/'],
+            ['exclude', '^browser/speech/'],
+            ['exclude', '^browser/sync/glue/app_'],
+            ['exclude', '^browser/sync/glue/extension_'],
             ['exclude', '^browser/themes/'],
             ['exclude', '^browser/ui/intents/'],
             ['exclude', '^browser/ui/omnibox/'],
@@ -2474,6 +2480,7 @@
             ['exclude', '^browser/ui/webui/suggestions_internals'],
             ['exclude', '^browser/ui/webui/sync_promo'],
             # No service process on Android.
+            ['exclude', '^browser/service/'],
             ['exclude', '^common/service_'],
             ['exclude', '^service/'],
           ],
diff --git a/content/content_renderer.gypi b/content/content_renderer.gypi
index 42b967a..e8c992f 100644
--- a/content/content_renderer.gypi
+++ b/content/content_renderer.gypi
@@ -264,23 +264,21 @@
     'renderer/websharedworkerrepository_impl.h',
   ],
   'conditions': [
-    ['toolkit_uses_gtk == 1', {
-      'conditions': [
-        ['input_speech==0', {
-          'sources!': [
-            'renderer/input_tag_speech_dispatcher.cc',
-            'renderer/input_tag_speech_dispatcher.h',
-            'renderer/speech_recognition_dispatcher.cc',
-            'renderer/speech_recognition_dispatcher.h',
-          ]
-        }],
-        ['notifications==0', {
-          'sources!': [
-            'renderer/notification_provider.cc',
-            'renderer/active_notification_tracker.cc',
-          ],
-        }],
+    ['notifications==0', {
+      'sources!': [
+        'renderer/notification_provider.cc',
+        'renderer/active_notification_tracker.cc',
       ],
+    }],
+    ['input_speech==0', {
+      'sources!': [
+        'renderer/input_tag_speech_dispatcher.cc',
+        'renderer/input_tag_speech_dispatcher.h',
+        'renderer/speech_recognition_dispatcher.cc',
+        'renderer/speech_recognition_dispatcher.h',
+      ]
+    }],
+    ['toolkit_uses_gtk == 1', {
       'dependencies': [
         '../build/linux/system.gyp:gtk',
       ],
diff --git a/net/net.gyp b/net/net.gyp
index e412ac6..6adaf04 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1073,6 +1073,7 @@
               'net_jni_headers',
             ],
             'sources!': [
+              'base/dnssec_chain_verifier.cc',
               'base/openssl_memory_private_key_store.cc',
             ],
           }, {  # else OS! = "android"
diff --git a/skia/skia.gyp b/skia/skia.gyp
index 12a8679..1baec1a 100644
--- a/skia/skia.gyp
+++ b/skia/skia.gyp
@@ -593,10 +593,10 @@
               'sources/': [
                 ['include', 'ext/platform_device_linux\\.cc$'],
                 ['include', 'ext/platform_canvas_linux\\.cc$'],
+                ['exclude', '../third_party/skia/src/pdf/'],
               ],
               'sources!': [
                 'ext/vector_platform_device_skia.cc',
-                '../third_party/skia/src/pdf/SkPDFFont.cpp',
               ],
               'export_dependent_settings': [
                 '../third_party/harfbuzz/harfbuzz.gyp:harfbuzz',
diff --git a/ui/gl/gl.gyp b/ui/gl/gl.gyp
index 6ce1de9..99bd59a 100644
--- a/ui/gl/gl.gyp
+++ b/ui/gl/gl.gyp
@@ -191,6 +191,7 @@
           'sources!': [
             '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.cc',
             '<(gl_binding_output_dir)/gl_bindings_autogen_osmesa.h',
+            'gl_context_osmesa.cc',
             'system_monitor_posix.cc',
           ],
           'defines': [
diff --git a/ui/ui.gyp b/ui/ui.gyp
index 8442274..762ac48 100644
--- a/ui/ui.gyp
+++ b/ui/ui.gyp
@@ -744,10 +744,12 @@
         }],
         ['OS=="android"', {
           'sources!': [
+            'base/dragdrop/drag_utils.cc',
+            'base/dragdrop/drag_utils.h',
             'base/touch/touch_factory.cc',
             'base/touch/touch_factory.h',
-            'gfx/pango_util.h',
             'gfx/pango_util.cc',
+            'gfx/pango_util.h',
             'gfx/platform_font_pango.cc',
             'gfx/platform_font_pango.h',
           ],
diff --git a/webkit/media/webkit_media.gypi b/webkit/media/webkit_media.gypi
index 994a354..d152991 100644
--- a/webkit/media/webkit_media.gypi
+++ b/webkit/media/webkit_media.gypi
@@ -65,8 +65,13 @@
         ['OS == "android"', {
           'sources!': [
             'audio_decoder.cc',
+            'audio_decoder.h',
+            'filter_helpers.cc',
+            'filter_helpers.h',
             'webmediaplayer_impl.cc',
             'webmediaplayer_impl.h',
+            'webmediaplayer_proxy.cc',
+            'webmediaplayer_proxy.h',
           ],
           'dependencies': [
             '<(DEPTH)/media/media.gyp:player_android',