Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3005)

Unified Diff: chrome/chrome_browser.gypi

Issue 9960072: Upstream crash changes for android. (Closed) Base URL: http://git.chromium.org/git/chromium.git@trunk
Patch Set: Fixes to gyp and a typo in breakpad_linuxish.cc Created 8 years, 8 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/ui/gtk/first_run_dialog.cc ('k') | chrome/common/logging_chrome_uitest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index e1a0cfa002f92b14e1af81bc58c57b05647c131a..9f155fe70c0556075285c93f66962bc1b35c372d 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -931,7 +931,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',
@@ -4340,12 +4339,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',
@@ -4353,13 +4355,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',
],
}],
],
« no previous file with comments | « chrome/browser/ui/gtk/first_run_dialog.cc ('k') | chrome/common/logging_chrome_uitest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698