Index: chrome/chrome_browser.gypi |
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi |
index 690ef24a1833a7f2e11616b70d82af9ec03705df..bd704ca77a33da62467ebfafaf53f963e4756088 100644 |
--- a/chrome/chrome_browser.gypi |
+++ b/chrome/chrome_browser.gypi |
@@ -4576,9 +4576,9 @@ |
'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', |
@@ -4586,13 +4586,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', |
], |
}], |
], |
@@ -5158,6 +5158,17 @@ |
]} |
], |
], |
+ 'target_conditions': [ |
+ # We need 'target_conditions' to override default filename_rules |
Mark Mentovai
2012/06/21 14:49:38
Don’t use “we” in comments.
Xianzhu
2012/06/24 04:04:48
Done.
|
+ # to include the files on Android. |
+ ['OS=="android"', { |
+ 'sources': [ |
+ ['include', '^app/breakpad_linux.cc'], |
Mark Mentovai
2012/06/21 14:49:38
Since you’re using regular expressions, use proper
Xianzhu
2012/06/24 04:04:48
I used \\. and $ in the previous change set, but n
Mark Mentovai
2012/06/24 12:33:15
Xianzhu wrote:
Xianzhu
2012/06/26 11:49:27
Should we file a bug to add them elsewhere?
On 20
|
+ ['include', '^browser/crash_handler_host_linux.cc'], |
+ ['include', '^browser/crash_handler_host_linux_stub.cc'], |
+ ], |
+ }], |
+ ], |
}, |
{ |
'target_name': 'autofill_regexes', |