Linux: make it possible to build with third_party/xdg-utils directory removed...

chrome/chrome_exe.gypi

Index: chrome/chrome_exe.gypi
===================================================================
--- chrome/chrome_exe.gypi	(revision 71594)
+++ chrome/chrome_exe.gypi	(working copy)
@@ -141,6 +141,7 @@
       'msvs_guid': '7B219FAA-E360-43C8-B341-804A94EEFFAC',
       'variables': {
         'chrome_exe_target': 1,
+        'use_system_xdg_utils%': 0,

[Mike Mammarella, 2011/01/18 18:17:19]

Would it be possible to put this constant along with the other similar constants
that control whether bundled stuff is used? It seems like it will be
increasingly annoying for distributions to patch all these changes into the gyp
files if the constants they're changing are scattered about.

       },
       'conditions': [
         ['OS=="linux" or OS=="freebsd" or OS=="openbsd"', {
@@ -187,6 +188,27 @@
                 ],
               },
             ],
+            ['use_system_xdg_utils==0', {
+              'copies': [
+                {
+                  'destination': '<(PRODUCT_DIR)',
+                  'files': ['tools/build/linux/chrome-wrapper',

[Mike Mammarella, 2011/01/18 18:17:19]

The chrome-wrapper script isn't part of xdg-utils; you probably want to copy it
below, not inside this condition. Maybe a separate condition for it is warranted
though, if distributions don't want this script either and have their own
version instead.

+                            '../third_party/xdg-utils/scripts/xdg-mime',
+                            '../third_party/xdg-utils/scripts/xdg-settings',
+                            ],
+                  # The wrapper script above may need to generate a .desktop
+                  # file, which requires an icon. So, copy one next to the
+                  # script.
+                  'conditions': [
+                    ['branding=="Chrome"', {
+                      'files': ['app/theme/google_chrome/product_logo_48.png']
+                    }, { # else: 'branding!="Chrome"
+                      'files': ['app/theme/chromium/product_logo_48.png']
+                    }],
+                  ],
+                },
+              ],
+            }],
           ],
           'dependencies': [
             # On Linux, link the dependencies (libraries) that make up actual
@@ -203,24 +225,6 @@
             'app/chrome_main.cc',
             'app/chrome_dll_resource.h',
           ],
-          'copies': [
-            {
-              'destination': '<(PRODUCT_DIR)',
-              'files': ['tools/build/linux/chrome-wrapper',
-                        '../third_party/xdg-utils/scripts/xdg-mime',
-                        '../third_party/xdg-utils/scripts/xdg-settings',
-                        ],
-              # The wrapper script above may need to generate a .desktop file,
-              # which requires an icon. So, copy one next to the script.
-              'conditions': [
-                ['branding=="Chrome"', {
-                  'files': ['app/theme/google_chrome/product_logo_48.png']
-                }, { # else: 'branding!="Chrome"
-                  'files': ['app/theme/chromium/product_logo_48.png']
-                }],
-              ],
-            },
-          ],
         }],
         ['OS=="mac"', {
           # 'branding' is a variable defined in common.gypi