Revert 120106 - Cleanup: Merge some OS specific sections in chrome/*.gypi.

chrome/chrome_exe.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': 'chrome',
       'type': 'executable',
       'mac_bundle': 1,
@@ skipping 144 matching lines @@
               ],
             }],
           ],
           'sources': [
             'app/chrome_dll_resource.h',
             'app/chrome_main.cc',
             'app/chrome_main_delegate.cc',
             'app/chrome_main_delegate.h',
           ],
         }],
-        ['OS=="linux"', {
-          'conditions': [
-            ['branding=="Chrome"', {
-              'dependencies': [
-                'linux_installer_configs',
-              ],
-            }],
-            ['selinux==0', {
-              'dependencies': [
-                '../sandbox/sandbox.gyp:sandbox',
-              ],
-            }],
-            # For now, do not build nacl_helper when disable_nacl=1
-            # or when arm is enabled
-            # http://code.google.com/p/gyp/issues/detail?id=239
-            ['disable_nacl==0 and target_arch!="arm"', {
-              'dependencies': [
-                '../native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp:nacl_helper_bootstrap',
-                'nacl_helper',
-                ],
-            }],
-          ],
-        }],
         ['OS=="mac"', {
           # 'branding' is a variable defined in common.gypi
           # (e.g. "Chromium", "Chrome")
           'conditions': [
             ['branding=="Chrome"', {
               'mac_bundle_resources': [
                 'app/theme/google_chrome/app.icns',
                 'app/theme/google_chrome/document.icns',
                 'browser/ui/cocoa/applescript/scripting.sdef',
               ],
@@ skipping 59 matching lines @@
             #   CFBundleIdentifier of CHROMIUM_BUNDLE_ID
             #   CFBundleName of CHROMIUM_SHORT_NAME
             #   CFBundleSignature of CHROMIUM_CREATOR
             # Xcode then replaces these values with the branded values we set
             # as settings on the target.
             'CHROMIUM_BUNDLE_ID': '<(mac_bundle_id)',
             'CHROMIUM_CREATOR': '<(mac_creator)',
             'CHROMIUM_SHORT_NAME': '<(branding)',
           },
           'dependencies': [
-            # On Mac, make sure we've built chrome_dll, which contains all of
-            # the library code with Chromium functionality.
-            'chrome_dll',
             'helper_app',
             'infoplist_strings_tool',
             'interpose_dependency_shim',
             'chrome_manifest_bundle',
           ],
           'mac_bundle_resources': [
             '<(PRODUCT_DIR)/<(mac_bundle_id).manifest',
           ],
           'actions': [
             {
@@ skipping 120 matching lines @@
             },
             {
               # Make sure there isn't any Objective-C in the browser app's
               # executable.
               'postbuild_name': 'Verify No Objective-C',
               'action': [
                 'tools/build/mac/verify_no_objc.sh',
               ],
             },
           ],  # postbuilds
-        }, {  # OS != "mac"
+        }],
+        ['OS=="linux"', {
+          'conditions': [
+            ['branding=="Chrome"', {
+              'dependencies': [
+                'linux_installer_configs',
+              ],
+            }],
+            ['selinux==0', {
+              'dependencies': [
+                '../sandbox/sandbox.gyp:sandbox',
+              ],
+            }],
+          ],
+        }],
+        ['OS != "mac"', {
           'conditions': [
             # TODO:  add a:
             #   'product_name': 'chromium'
             # whenever we convert the rest of the infrastructure
             # (buildbots etc.) to understand the branding gyp define.
             # NOTE: chrome/app/theme/chromium/BRANDING and
             # chrome/app/theme/google_chrome/BRANDING have the short name
             # "chrome" etc.; should we try to extract from there instead?
 
             # On Mac, this is done in chrome_dll.gypi.
             ['internal_pdf', {
               'dependencies': [
                 '../pdf/pdf.gyp:pdf',
               ],
             }],
           ],
           'dependencies': [
             'chrome_resources.gyp:packed_extra_resources',
             'chrome_resources.gyp:packed_resources',
             # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp
             # file decide what to do on a per-OS basis; on Mac, internal plugins
             # go inside the framework, so this dependency is in chrome_dll.gypi.
             '../third_party/adobe/flash/flash_player.gyp:flash_player',
           ],
         }],
+        ['OS=="linux"', {
+          'conditions': [
+            # For now, do not build nacl_helper when disable_nacl=1
+            # or when arm is enabled
+            # http://code.google.com/p/gyp/issues/detail?id=239
+            ['disable_nacl==0 and target_arch!="arm"', {
+              'dependencies': [
+                '../native_client/src/trusted/service_runtime/linux/nacl_bootstrap.gyp:nacl_helper_bootstrap',
+                'nacl_helper',
+                ],
+            }],
+          ],
+        }],
+        ['OS=="mac"', {
+          'dependencies': [
+            # On Mac, make sure we've built chrome_dll, which contains all of
+            # the library code with Chromium functionality.
+            'chrome_dll',
+          ],
+        }],
         ['OS=="mac" and asan==1', {
           'xcode_settings': {
             # Override the outer definition of CHROMIUM_STRIP_SAVE_FILE.
             'CHROMIUM_STRIP_SAVE_FILE': 'app/app_asan.saves',
           },
         }],
         ['OS=="win"', {
           'dependencies': [
             'chrome_dll',
             'chrome_version_resources',
@@ skipping 102 matching lines @@
           'configurations': {
             'Common_Base': {
               'msvs_target_platform': 'x64',
             },
           },
         },
       ],
     }],
   ],
 }