Misc undefined symbol fixes for Android+LTO.

chrome/chrome_browser.gypi

 # Copyright 2012 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': {
     # All .cc, .h, .m, and .mm files under browser except for:
     # * tests and mocks.
     # * code below browser/chromeos
     # * code below browser/extensions
@@ skipping 231 matching lines @@
       'browser/browsing_data/browsing_data_remover.cc',
       'browser/browsing_data/browsing_data_remover.h',
       'browser/browsing_data/browsing_data_service_worker_helper.cc',
       'browser/browsing_data/browsing_data_service_worker_helper.h',
       'browser/browsing_data/canonical_cookie_hash.cc',
       'browser/browsing_data/canonical_cookie_hash.h',
       'browser/browsing_data/cookies_tree_model.cc',
       'browser/browsing_data/cookies_tree_model.h',
       'browser/browsing_data/local_data_container.cc',
       'browser/browsing_data/local_data_container.h',
-      'browser/caps/generate_state_json.h',
-      'browser/caps/generate_state_json.cc',
       'browser/character_encoding.cc',
       'browser/character_encoding.h',
       'browser/chrome_browser_application_mac.h',
       'browser/chrome_browser_application_mac.mm',
       'browser/chrome_browser_field_trials.cc',
       'browser/chrome_browser_field_trials.h',
       'browser/chrome_browser_main.cc',
       'browser/chrome_browser_main.h',
       'browser/chrome_browser_main_android.cc',
       'browser/chrome_browser_main_android.h',
@@ skipping 532 matching lines @@
       # support ChromeOS with enable_plugins==0.
       'browser/renderer_host/pepper/pepper_platform_verification_message_filter.cc',
       'browser/renderer_host/pepper/pepper_platform_verification_message_filter.h',
     ],
     # Used everywhere but ChromeOS.
     'chrome_browser_non_chromeos_sources': [
       'browser/signin/signin_global_error.cc',
       'browser/signin/signin_global_error.h',
       'browser/signin/signin_global_error_factory.cc',
       'browser/signin/signin_global_error_factory.h',
-      'browser/sync/sync_global_error_factory.cc',
-      'browser/sync/sync_global_error_factory.h',
     ],
     # Everything but Android, iOS, and CrOS.
     'chrome_browser_desktop_sources': [
       'browser/platform_util.cc',
       'browser/profiles/avatar_menu_actions_desktop.cc',
       'browser/profiles/avatar_menu_actions_desktop.h',
       'browser/profiles/avatar_menu_desktop.cc',
       'browser/profiles/avatar_menu_observer.h',
       'browser/profiles/profile_list_desktop.cc',
       'browser/profiles/profile_list_desktop.h',
@@ skipping 1280 matching lines @@
     'chrome_browser_policy_mobile_sources': [
       'browser/policy/cloud/user_policy_signin_service_mobile.cc',
       'browser/policy/cloud/user_policy_signin_service_mobile.h',
     ],
     # Policy sources used only on desktop OS's (CrOS not counted).
     'chrome_browser_policy_desktop_sources': [
       'browser/policy/cloud/user_policy_signin_service.cc',
       'browser/policy/cloud/user_policy_signin_service.h',
       'browser/sync/sync_global_error.cc',
       'browser/sync/sync_global_error.h',
+      'browser/sync/sync_global_error_factory.cc',
+      'browser/sync/sync_global_error_factory.h',
       'browser/upgrade_detector_impl.cc',
       'browser/upgrade_detector_impl.h',
     ],
     # Policy sources used if plugins are enabled.
     'chrome_browser_policy_plugin_sources': [
       'browser/plugins/enable_npapi_plugins_policy_handler.cc',
       'browser/plugins/enable_npapi_plugins_policy_handler.h',
     ],
     'chrome_browser_predictor_sources': [
       'browser/predictors/autocomplete_action_predictor.cc',
@@ skipping 727 matching lines @@
       'browser/sync/supervised_user_signin_manager_wrapper.h',
       'browser/sync/sync_error_controller.cc',
       'browser/sync/sync_error_controller.h',
       'browser/sync/sync_startup_tracker.cc',
       'browser/sync/sync_startup_tracker.h',
       'browser/sync/sync_stopped_reporter.cc',
       'browser/sync/sync_stopped_reporter.h',
       'browser/sync/sync_type_preference_provider.h',
     ],
     'chrome_browser_task_manager_sources': [
+      # Stats collection for CAPS (uses old task manager):
+      'browser/caps/generate_state_json.cc',
+      'browser/caps/generate_state_json.h',
+
       # New Task Manager Sources:
       'browser/task_management/providers/browser_process_task_provider.cc',
       'browser/task_management/providers/browser_process_task_provider.h',
       'browser/task_management/providers/browser_process_task.cc',
       'browser/task_management/providers/browser_process_task.h',
       'browser/task_management/providers/child_process_task_provider.cc',
       'browser/task_management/providers/child_process_task_provider.h',
       'browser/task_management/providers/child_process_task.cc',
       'browser/task_management/providers/child_process_task.h',
       'browser/task_management/providers/task_provider_observer.h',
@@ skipping 975 matching lines @@
           'variables': {
             'proto_in_dir': 'browser/sync_file_system/drive_backend',
             'proto_out_dir': 'chrome/browser/sync_file_system/drive_backend',
           },
           'includes': [ '../build/protoc.gypi' ]
         },
       ],
     },],
   ],
 }