Rename back _linuxish to linux.

chrome/chrome_browser.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 #
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
@@ skipping 4553 matching lines @@
             'libraries': [
               '-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',
                 # make sure file_version_info_linux.h is generated first.
                 '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',
               ],
             }],
           ],
         }],
         ['use_aura==0', {
           'sources/': [
             ['exclude', '^browser/ui/webui/gesture_config_ui.cc'],
             ['exclude', '^browser/ui/webui/gesture_config_ui.h']
           ],
         }],
@@ skipping 547 matching lines @@
             ['exclude', '^browser/ui/gtk/select_file_dialog_impl_kde.cc'],
             ['include', '^browser/ui/views/select_file_dialog_extension.cc'],
             ['include', '^browser/ui/views/select_file_dialog_extension.h'],
           ]}, {
           'sources/': [
             ['exclude', '^browser/ui/views/select_file_dialog_extension.cc'],
             ['exclude', '^browser/ui/views/select_file_dialog_extension.h'],
           ]}
         ],
       ],
+      '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',
       'type': 'none',
       'actions': [{
         'action_name': 'autofill_regexes',
         'inputs': [
           '<(DEPTH)/build/escape_unicode.py',
           'browser/autofill/autofill_regex_constants.cc.utf8',
         ],
@@ skipping 80 matching lines @@
         'browser/metrics/proto/study.proto',
       ],
       'variables': {
         'proto_in_dir': 'browser/metrics/proto',
         'proto_out_dir': 'chrome/browser/metrics/proto',
       },
       'includes': [ '../build/protoc.gypi' ]
     },
   ],
 }