Rename back _linuxish to linux.

chrome/chrome_browser.gypi

Index: chrome/chrome_browser.gypi
diff --git a/chrome/chrome_browser.gypi b/chrome/chrome_browser.gypi
index 0d7a22e84efcdf664a4b9c13c4847dbe98c90f32..a0cbed70ea299c2eb940608b03c65be835dafb4e 100644
--- a/chrome/chrome_browser.gypi
+++ b/chrome/chrome_browser.gypi
@@ -4571,9 +4571,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',
@@ -4581,13 +4581,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',
               ],
             }],
           ],
@@ -5155,6 +5155,17 @@
           ]}
         ],
       ],
+      'target_conditions': [
+        # We need 'target_conditions' to override default filename_rules
+        # to include the files on Android.
+        ['OS=="android"', {
+          'sources/': [
+            ['include', '^app/breakpad_linux\\.(cc|h)$'],
+            ['include', '^browser/crash_handler_host_linux\\.(cc|h)$'],
+            ['include', '^browser/crash_handler_host_linux_stub\\.cc$'],

[jam, 2012/06/18 15:34:44]

nit: do you really need regular expressions here (they slow down gyp a bit
afaik). i..e you can just add the .cc files. we only list the header files for
IDE's sake.

[Xianzhu, 2012/06/20 07:58:21]

Using 'sources/' is important here otherwise I must use a condition containing
the linux_breakpad variable but it is not available in 'target_conditions'
scope. I can copy the variable into the 'target_conditions' scope but that need
more tricky gyp lines.

I can simplify the regexes.

On 2012/06/18 15:34:44, John Abd-El-Malek wrote:

+          ],
+        }],
+      ],
     },
     {
       'target_name': 'autofill_regexes',