diff options
author | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-18 18:36:55 +0000 |
---|---|---|
committer | phajdan.jr@chromium.org <phajdan.jr@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-01-18 18:36:55 +0000 |
commit | ce04cfd039819bf90c1a1144b282d5f310631131 (patch) | |
tree | 04884b45af53db4285c053361b80a2986920c705 /chrome/chrome_exe.gypi | |
parent | 2c204b9522b9937f0af0212bae98031277eecb33 (diff) | |
download | chromium_src-ce04cfd039819bf90c1a1144b282d5f310631131.zip chromium_src-ce04cfd039819bf90c1a1144b282d5f310631131.tar.gz chromium_src-ce04cfd039819bf90c1a1144b282d5f310631131.tar.bz2 |
Linux: make it possible to build with third_party/xdg-utils directory removed
This is useful for Linux distributions that remove third party directories
to ensure that the bundled versions will not be used.
In fact, this is upstreaming a Gentoo Linux patch.
TEST=none
BUG=none
Review URL: http://codereview.chromium.org/6282005
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@71672 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chrome/chrome_exe.gypi')
-rw-r--r-- | chrome/chrome_exe.gypi | 40 |
1 files changed, 22 insertions, 18 deletions
diff --git a/chrome/chrome_exe.gypi b/chrome/chrome_exe.gypi index f058feb..1d9768c 100644 --- a/chrome/chrome_exe.gypi +++ b/chrome/chrome_exe.gypi @@ -141,6 +141,7 @@ 'msvs_guid': '7B219FAA-E360-43C8-B341-804A94EEFFAC', 'variables': { 'chrome_exe_target': 1, + 'use_system_xdg_utils%': 0, }, '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', + '../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 |