diff options
| author | shashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 05:19:35 +0000 |
|---|---|---|
| committer | shashishekhar@chromium.org <shashishekhar@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-10-30 05:19:35 +0000 |
| commit | c3cbe3536b4885fdc2a7ece5863e273a47c42964 (patch) | |
| tree | 058525c70cda45b5674295d21a78185f554e5983 /chrome/chrome_browser.gypi | |
| parent | f8846e29f1026240df5628b217afdc8a3f8b1ef5 (diff) | |
| download | chromium_src-c3cbe3536b4885fdc2a7ece5863e273a47c42964.zip chromium_src-c3cbe3536b4885fdc2a7ece5863e273a47c42964.tar.gz chromium_src-c3cbe3536b4885fdc2a7ece5863e273a47c42964.tar.bz2 | |
Upstream changes to chrome_browser.gypi.
Android does not need some of the dependencies since we do
not use them.
BUG=157226
Review URL: https://chromiumcodereview.appspot.com/11307015
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@164860 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rw-r--r-- | chrome/chrome_browser.gypi | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index a01c7bb..45b7bed 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -2285,6 +2285,7 @@ ], }, { # safe_browsing==0 'dependencies!': [ + 'safe_browsing_proto', 'safe_browsing_report_proto', '../third_party/libusb/libusb.gyp:libusb', ], @@ -2567,6 +2568,7 @@ 'browser/web_resource/notification_promo_mobile_ntp.h', ], 'sources!': [ + 'browser/bookmarks/bookmark_drop_info.cc', # Bookmark export/import are handled via the BookmarkColumns # ContentProvider. 'browser/bookmarks/bookmark_html_writer.cc', @@ -2587,12 +2589,25 @@ 'browser/managed_mode/managed_mode_url_filter.cc', 'browser/managed_mode/managed_mode_url_filter.h', 'browser/net/gaia/gaia_oauth_fetcher.cc', + 'browser/omnibox_search_hint.cc', 'browser/page_cycler/page_cycler.cc', 'browser/page_cycler/page_cycler.h', 'browser/sessions/persistent_tab_restore_service.cc', 'browser/sessions/persistent_tab_restore_service.h', 'browser/sessions/session_backend.cc', 'browser/sessions/session_backend.h', + '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/upgrade_detector.cc', 'browser/upgrade_detector.h', 'browser/upgrade_detector_impl.cc', @@ -2614,6 +2629,7 @@ ['exclude', '^browser/speech/'], ['exclude', '^browser/sync/glue/app_'], ['exclude', '^browser/sync/glue/extension_'], + ['exclude', '^browser/sync/glue/theme_'], ['exclude', '^browser/usb/'], ], }], |