diff options
| author | carlosvaldivia@google.com <carlosvaldivia@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 22:52:44 +0000 |
|---|---|---|
| committer | carlosvaldivia@google.com <carlosvaldivia@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-10 22:52:44 +0000 |
| commit | 6653c19c044e724ad9a93248611abd2135d16a1a (patch) | |
| tree | 1e036d686937704495302c125d7f3f200a521470 /chrome/chrome_browser.gypi | |
| parent | b168ddfb28b4d83213dcfd5974ba64d2dc964030 (diff) | |
| download | chromium_src-6653c19c044e724ad9a93248611abd2135d16a1a.zip chromium_src-6653c19c044e724ad9a93248611abd2135d16a1a.tar.gz chromium_src-6653c19c044e724ad9a93248611abd2135d16a1a.tar.bz2 | |
Upstream crash changes for android.
Third time is a charm.
Original Reviews:
https://chromiumcodereview.appspot.com/9838033/
http://codereview.chromium.org/9967017
Revert "Revert 131593"
This reverts commit e306ea7f630d4264075913ea3a1a728d98ca9605.
BUG=
TEST=
Review URL: http://codereview.chromium.org/9960072
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131662 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rw-r--r-- | chrome/chrome_browser.gypi | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index ea3fd8f..be4472b 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -932,7 +932,6 @@ 'browser/content_settings/tab_specific_content_settings.h', 'browser/cookies_tree_model.cc', 'browser/cookies_tree_model.h', - 'browser/crash_handler_host_linux.h', 'browser/crash_upload_list.cc', 'browser/crash_upload_list.h', 'browser/crash_upload_list_win.cc', @@ -4339,12 +4338,15 @@ '-lXss', ], }, + }], + ['os_posix == 1 and OS != "mac"', { + 'sources': [ 'browser/crash_handler_host_linuxish.h', ], 'conditions': [ ['linux_breakpad==1', { 'sources': [ - 'app/breakpad_linux.cc', - 'app/breakpad_linux.h', - 'browser/crash_handler_host_linux.cc', + 'app/breakpad_linuxish.cc', + 'app/breakpad_linuxish.h', + 'browser/crash_handler_host_linuxish.cc', ], 'dependencies': [ '../breakpad/breakpad.gyp:breakpad_client', @@ -4352,13 +4354,13 @@ 'common', ], 'include_dirs': [ - # breakpad_linux.cc uses generated file_version_info_linux.h. + # breakpad_linuxish.cc uses generated file_version_info_linux.h. '<(SHARED_INTERMEDIATE_DIR)', '../breakpad/src', ], }, { # linux_breakpad==0 'sources': [ - 'browser/crash_handler_host_linux_stub.cc', + 'browser/crash_handler_host_linuxish_stub.cc', ], }], ], |