Misc undefined symbol fixes for Android+LTO.

chrome/chrome_browser_ui.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': {
     # There are two sections of sources:
     # * "Platform"-based sources (OS, toolkit, etc.)
     # * Feature/directory-based sources (e.g., history, printing)
 
@@ skipping 120 matching lines @@
       'browser/ui/bookmarks/bookmark_tab_helper.h',
       'browser/ui/bookmarks/bookmark_utils.cc',
       'browser/ui/bookmarks/bookmark_utils.h',
       'browser/ui/bookmarks/recently_used_folders_combo_model.cc',
       'browser/ui/bookmarks/recently_used_folders_combo_model.h',
       'browser/ui/browser_commands_chromeos.cc',
       'browser/ui/browser_commands_chromeos.h',
       'browser/ui/browser_commands_mac.cc',
       'browser/ui/browser_commands_mac.h',
       'browser/ui/browser_dialogs.h',
-      'browser/ui/browser_instant_controller.cc',
-      'browser/ui/browser_instant_controller.h',
       'browser/ui/browser_mac.cc',
       'browser/ui/browser_mac.h',
       'browser/ui/browser_navigator.cc',
       'browser/ui/browser_navigator.h',
       'browser/ui/browser_otr_state_android.cc',
       'browser/ui/browser_ui_prefs.cc',
       'browser/ui/browser_ui_prefs.h',
       'browser/ui/browser_win.cc',
       'browser/ui/browser_window.h',
       'browser/ui/chrome_select_file_policy.cc',
@@ skipping 55 matching lines @@
       'browser/ui/prefs/prefs_tab_helper.cc',
       'browser/ui/prefs/prefs_tab_helper.h',
       'browser/ui/process_singleton_dialog_linux.h',
       'browser/ui/profile_chooser_constants.h',
       'browser/ui/profile_error_dialog.cc',
       'browser/ui/profile_error_dialog.h',
       'browser/ui/protocol_dialog_delegate.h',
       'browser/ui/proximity_auth/proximity_auth_error_bubble.cc',
       'browser/ui/proximity_auth/proximity_auth_error_bubble.h',
       'browser/ui/screen_capture_notification_ui.h',
-      'browser/ui/search/instant_controller.cc',
-      'browser/ui/search/instant_controller.h',
       'browser/ui/search/instant_page.cc',
       'browser/ui/search/instant_page.h',
       'browser/ui/search/instant_search_prerenderer.cc',
       'browser/ui/search/instant_search_prerenderer.h',
       'browser/ui/search/instant_tab.cc',
       'browser/ui/search/instant_tab.h',
       'browser/ui/search/new_tab_page_interceptor_service.cc',
       'browser/ui/search/new_tab_page_interceptor_service.h',
       'browser/ui/search/new_tab_page_interceptor_service_factory.cc',
       'browser/ui/search/new_tab_page_interceptor_service_factory.h',
@@ skipping 290 matching lines @@
       'browser/ui/android/autofill/credit_card_scanner_view_android.cc',
       'browser/ui/android/autofill/credit_card_scanner_view_android.h',
       'browser/ui/android/infobars/account_chooser_infobar.cc',
       'browser/ui/android/infobars/account_chooser_infobar.h',
       'browser/ui/android/infobars/generated_password_saved_infobar.cc',
       'browser/ui/android/infobars/generated_password_saved_infobar.h',
       'browser/ui/auto_login_infobar_delegate.cc',
       'browser/ui/auto_login_infobar_delegate.h',
       'browser/ui/screen_capture_notification_ui_stub.cc',
     ],
-    # Files shared between CrOS, desktop linux, and Android.
-    'chrome_browser_ui_android_linux_sources': [
-      'browser/ui/certificate_dialogs.cc',
-      'browser/ui/certificate_dialogs.h',
-    ],
     # Cross-platform ash sources.
     'chrome_browser_ui_ash_sources': [
       'browser/ui/ash/app_list/app_list_controller_ash.cc',
       'browser/ui/ash/app_list/app_list_controller_ash.h',
       'browser/ui/ash/app_list/app_list_service_ash.cc',
       'browser/ui/ash/app_list/app_list_service_ash.h',
       'browser/ui/ash/app_list/app_sync_ui_state_watcher.cc',
       'browser/ui/ash/app_list/app_sync_ui_state_watcher.h',
       'browser/ui/ash/app_sync_ui_state.cc',
       'browser/ui/ash/app_sync_ui_state.h',
@@ skipping 799 matching lines @@
       'browser/ui/webui/help/version_updater_basic.h',
     ],
     # Files used on iOS. iOS uses only these files and does not share other
     # lists, so a file may appear here and in the non_ios_sources also.
     'chrome_browser_ui_ios_sources': [
       'browser/ui/profile_error_dialog.cc',
       'browser/ui/profile_error_dialog.h',
     ],
     # Counts desktop Linux and ChromeOS.
     'chrome_browser_ui_linux_sources': [
+      'browser/ui/certificate_dialogs.cc',
+      'browser/ui/certificate_dialogs.h',
       'browser/ui/startup/autolaunch_prompt.cc',
       'browser/ui/views/apps/chrome_app_window_client_views.cc',
       'browser/ui/webui/certificate_viewer_ui.cc',
       'browser/ui/webui/certificate_viewer_ui.h',
       'browser/ui/webui/certificate_viewer_webui.cc',
       'browser/ui/webui/certificate_viewer_webui.h',
     ],
     'chrome_browser_ui_mac_sources': [
       'browser/ui/cocoa/accelerator_utils_cocoa.mm',
       'browser/ui/cocoa/accelerators_cocoa.h',
@@ skipping 121 matching lines @@
       'browser/ui/browser.cc',
       'browser/ui/browser.h',
       'browser/ui/browser_command_controller.cc',
       'browser/ui/browser_command_controller.h',
       'browser/ui/browser_commands.cc',
       'browser/ui/browser_commands.h',
       'browser/ui/browser_content_setting_bubble_model_delegate.cc',
       'browser/ui/browser_content_setting_bubble_model_delegate.h',
       'browser/ui/browser_finder.cc',
       'browser/ui/browser_finder.h',
+      'browser/ui/browser_instant_controller.cc',
+      'browser/ui/browser_instant_controller.h',
       'browser/ui/browser_iterator.cc',
       'browser/ui/browser_iterator.h',
       'browser/ui/browser_list.cc',
       'browser/ui/browser_list.h',
       'browser/ui/browser_otr_state.cc',
       'browser/ui/browser_otr_state.h',
       'browser/ui/browser_tab_restore_service_delegate.cc',
       'browser/ui/browser_tab_restore_service_delegate.h',
       'browser/ui/browser_tab_restorer.cc',
       'browser/ui/browser_tab_strip_model_delegate.cc',
@@ skipping 95 matching lines @@
       'browser/ui/pdf/chrome_pdf_web_contents_helper_client.h',
       'browser/ui/pdf/pdf_unsupported_feature.cc',
       'browser/ui/pdf/pdf_unsupported_feature.h',
       'browser/ui/sad_tab.cc',
       'browser/ui/sad_tab.h',
       'browser/ui/sad_tab_helper.cc',
       'browser/ui/sad_tab_helper.h',
       'browser/ui/sad_tab_types.h',
       'browser/ui/scoped_tabbed_browser_displayer.cc',
       'browser/ui/scoped_tabbed_browser_displayer.h',
+      'browser/ui/search/instant_controller.cc',
+      'browser/ui/search/instant_controller.h',
       'browser/ui/search/search_delegate.cc',
       'browser/ui/search/search_delegate.h',
       'browser/ui/search/search_ui.cc',
       'browser/ui/search/search_ui.h',
       'browser/ui/search_engines/search_engine_tab_helper_delegate.cc',
       'browser/ui/search_engines/search_engine_tab_helper_delegate.h',
       'browser/ui/singleton_tabs.cc',
       'browser/ui/singleton_tabs.h',
       'browser/ui/startup/autolaunch_prompt.h',
       'browser/ui/startup/autolaunch_prompt_win.cc',
@@ skipping 1315 matching lines @@
           'sources': [ '<@(chrome_browser_ui_nss_sources)' ],
         }],
         ['enable_themes==0', {
           'sources!': [
             'browser/ui/webui/theme_source.cc',
           ],
         }],
         ['enable_print_preview==1', {
           'sources': [ '<@(chrome_browser_ui_print_preview_sources)' ],
         }],
-        ['OS=="linux" or OS=="android"', {
-          'sources': [ '<@(chrome_browser_ui_android_linux_sources)' ],
-        }],
         ['OS=="android"', {
           'dependencies': [
             '../components/components.gyp:web_contents_delegate_android',
             '../third_party/boringssl/boringssl.gyp:boringssl',
             'chrome_browser_jni_headers',
           ],
           'dependencies!': [
              '../ui/events/events.gyp:events',
              'chrome_browser_ui_views.gyp:browser_ui_views',
           ],
@@ skipping 206 matching lines @@
           ],
           'sources': [
             '<@(chrome_browser_ui_non_mobile_sources)',
             '<@(chrome_browser_ui_omnibox_non_mobile_sources)',
           ],
         }],
       ],
     },
   ],
 }