diff options
| author | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-09 20:10:17 +0000 |
|---|---|---|
| committer | msw@chromium.org <msw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-09 20:10:17 +0000 |
| commit | 9cdd080dcaf1108e0d0f9dcac65adb836401d4e8 (patch) | |
| tree | 58d6d4493dea55beebf54dac366ee7f85cddb72a /chrome/chrome_browser.gypi | |
| parent | 4eff7becd7a6be9621ae807c7aa3627d95c5913b (diff) | |
| download | chromium_src-9cdd080dcaf1108e0d0f9dcac65adb836401d4e8.zip chromium_src-9cdd080dcaf1108e0d0f9dcac65adb836401d4e8.tar.gz chromium_src-9cdd080dcaf1108e0d0f9dcac65adb836401d4e8.tar.bz2 | |
Revert 131404 - Upstream native crash handling changes for Android.
Android native crash handling is almost identical to linux handling with
some differences.
Note that even after this change Chrome on Android will not compile with
the USE_LINUX_BREAKPAD flag. Forthcomming changes in breakpad should
remedy this state of affairs.
BUG=
TEST=
Review URL: http://codereview.chromium.org/9838033
TBR=carlosvaldivia@google.com
Review URL: https://chromiumcodereview.appspot.com/9999004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@131420 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_browser.gypi')
| -rw-r--r-- | chrome/chrome_browser.gypi | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi index f1080e2..2d64498e 100644 --- a/chrome/chrome_browser.gypi +++ b/chrome/chrome_browser.gypi @@ -931,6 +931,7 @@ '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', @@ -4338,15 +4339,12 @@ '-lXss', ], }, - }], - ['os_posix == 1 and OS != "mac"', { - 'sources': [ 'browser/crash_handler_host_linuxish.h', ], 'conditions': [ ['linux_breakpad==1', { 'sources': [ - 'app/breakpad_linuxish.cc', - 'app/breakpad_linuxish.h', - 'browser/crash_handler_host_linuxish.cc', + 'app/breakpad_linux.cc', + 'app/breakpad_linux.h', + 'browser/crash_handler_host_linux.cc', ], 'dependencies': [ '../breakpad/breakpad.gyp:breakpad_client', @@ -4354,13 +4352,13 @@ 'common', ], 'include_dirs': [ - # breakpad_linuxish.cc uses generated file_version_info_linux.h. + # breakpad_linux.cc uses generated file_version_info_linux.h. '<(SHARED_INTERMEDIATE_DIR)', '../breakpad/src', ], }, { # linux_breakpad==0 'sources': [ - 'browser/crash_handler_host_linuxish_stub.cc', + 'browser/crash_handler_host_linux_stub.cc', ], }], ], |