Upstream changes to chrome_browser.gypi.

chrome/chrome_browser.gypi

 # Copyright (c) 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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
@@ skipping 2529 matching lines @@
             'browser/sessions/session_service.h',
             'browser/sessions/session_service_factory.cc',
             'browser/sessions/session_service_factory.h',
           ],
         }],
         ['OS=="android"', {
           'dependencies': [
             'browser/component/components.gyp:web_contents_delegate_android',
             'chrome_browser_jni_headers',
           ],
+          'dependencies!': [
+            'safe_browsing_report_proto',

[nilesh, 2012/10/26 22:45:28]

This is already excluded if safe_browsing == 0
exclude: safe_browsing_proto (if safe_browsing is not enabled) in this file and
chrome/chrome_browser_ui.gypi

[shashi, 2012/10/29 17:54:55]

Done.

+          ],
           'sources': [
             'browser/web_resource/notification_promo_mobile_ntp.cc',
             'browser/web_resource/notification_promo_mobile_ntp.h',
           ],
           'sources!': [
+            'browser/autocomplete/autocomplete_edit.cc',
+            'browser/bookmarks/bookmark_drop_info.cc',
             # Bookmark export/import are handled via the BookmarkColumns
             # ContentProvider.
             'browser/bookmarks/bookmark_html_writer.cc',
 
             # about:flags is unsupported.
             'browser/about_flags.cc',
             'browser/about_flags.h',
 
             'browser/jankometer.cc',
             'browser/sync/sync_global_error.cc',
             'browser/sync/sync_global_error.h',
 
             # There's no Browser/BrowserList on Android.
             'browser/download/download_crx_util.cc',
             'browser/lifetime/application_lifetime_stub.cc',
             'browser/managed_mode.cc',
             'browser/managed_mode.h',
             'browser/managed_mode_url_filter.cc',
             'browser/managed_mode_url_filter.h',
             'browser/net/gaia/gaia_oauth_fetcher.cc',
             'browser/page_cycler/page_cycler.cc',
             'browser/page_cycler/page_cycler.h',
+            'browser/ui/uma_browsing_activity_observer.cc',
+            'browser/ui/uma_browsing_activity_observer.h',
+            # display_utils_posix uses the gdk.h header which is not available
+            # on Android.
+            'browser/metrics/display_utils_posix.cc',

[sky, 2012/10/26 23:19:51]

Keep things sorted.

[shashi, 2012/10/29 17:54:55]

Done.

+            'browser/omnibox_search_hint.cc',
+            'browser/tab_contents/background_contents.cc',
+            'browser/tab_contents/background_contents.h',
+            'browser/tab_contents/render_view_context_menu.cc',
+            'browser/tab_contents/render_view_context_menu.h',
+            'browser/tab_contents/render_view_context_menu_observer.cc',
+            'browser/tab_contents/render_view_context_menu_observer.h',
+            'browser/tab_contents/spellchecker_submenu_observer.h',
+            'browser/tab_contents/spellchecker_submenu_observer_hunspell.cc',
+            'browser/tab_contents/spelling_bubble_model.cc',
+            'browser/tab_contents/spelling_bubble_model.h',
+            'browser/tab_contents/spelling_menu_observer.cc',
+            'browser/tab_contents/spelling_menu_observer.h',
+            'browser/ui/webui/bookmarks_ui.cc',
+            'browser/ui/webui/bookmarks_ui.h',
+            'browser/ui/webui/html_dialog_tab_contents_delegate.cc',
+            'browser/ui/webui/tracing_ui.cc',
+            'browser/ui/webui/tracing_ui.h',
             'browser/upgrade_detector.cc',
             'browser/upgrade_detector.h',
             'browser/upgrade_detector_impl.cc',
             'browser/upgrade_detector_impl.h',
 
             # Not used by Android
             'browser/chrome_browser_main_posix.cc',
             'browser/chrome_browser_main_posix.h',
             'browser/process_singleton.cc',
           ],
           'sources/': [
             ['exclude', '^browser/captive_portal/'],
+            ['exclude', '^browser/background/'],
             ['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/sync/glue/theme_'],
             ['exclude', '^browser/usb/'],
           ],
         }],
         ['OS=="mac"', {
           'sources!': [
             'browser/automation/automation_provider_list_generic.cc',
             'browser/bookmarks/bookmark_drop_info.cc',
             'browser/first_run/upgrade_util.cc',
             'browser/importer/nss_decryptor_system_nss.cc',
             'browser/importer/nss_decryptor_system_nss.h',
@@ skipping 328 matching lines @@
             'proto_in_dir': '../third_party/cros_system_api/dbus',
             'proto_out_dir': 'chrome/browser/media_transfer_protocol',
           },
           'includes': ['../build/protoc.gypi'],
         },
       ],
      },
     ],
   ],
 }