Break gyp cycles on Linux.

The cycle is between installer.gyp and chrome.gyp.  The fix is to switch installer.gyp into installer.gypi and include it into chrome.gyp

BUG=35308

Review URL: http://codereview.chromium.org/2067018

git-svn-id: http://src.chromium.org/svn/trunk/src/build@48007 4ff67af0-8c30-449e-8e8b-ad334ec8d88c

all.gyp

@@ -72,7 +72,7 @@
           'conditions': [
             ['branding=="Chrome"', {
               'dependencies': [
-                '../chrome/installer/installer.gyp:linux_packages_<(channel)',
+                '../chrome/chrome.gyp:linux_packages_<(channel)',
               ],
             }],
           ],
@@ -211,8 +211,10 @@
           'dependencies': [
             '../app/app.gyp:app_unittests',
             '../chrome/chrome.gyp:browser_tests',
+            '../chrome/chrome.gyp:installer_util_unittests',
             '../chrome/chrome.gyp:interactive_ui_tests',
             '../chrome/chrome.gyp:memory_test',
+            '../chrome/chrome.gyp:mini_installer_test',
             '../chrome/chrome.gyp:nacl_ui_tests',
             '../chrome/chrome.gyp:notifier_unit_tests',
             '../chrome/chrome.gyp:page_cycler_tests',
@@ -224,8 +226,6 @@
             '../chrome/chrome.gyp:ui_tests',
             '../chrome/chrome.gyp:unit_tests',
             '../chrome/chrome.gyp:url_fetch_test',
-            '../chrome/installer/installer.gyp:installer_util_unittests',
-            '../chrome/installer/installer.gyp:mini_installer_test',
             # mini_installer_tests depends on mini_installer. This should be
             # defined in installer.gyp.
             '../chrome/installer/mini_installer.gyp:mini_installer',

gyp_chromium

@@ -79,7 +79,7 @@ if __name__ == '__main__':
   # violation of the rule causes Xcode to misbehave badly.
   # TODO(mark): Find and kill remaining circular dependencies, and remove this
   # option.  http://crbug.com/35878.
-  if sys.platform != 'darwin':
+  if sys.platform not in ('darwin', 'linux2'):
     args.append('--no-circular-check')
 
   # If CHROMIUM_GYP_SYNTAX_CHECK is set to 1, it will invoke gyp with --check