summaryrefslogtreecommitdiffstats
path: root/google_update
diff options
context:
space:
mode:
authorbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-10 05:57:12 +0000
committerbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-07-10 05:57:12 +0000
commit4f18b677bf07e0d6e92bccc07e96854fa245ea17 (patch)
treec00796311e1d4ab5ee60af966fab1ae6a5c786af /google_update
parent2c93d189c2d2100b8745a3ba19d6f49c6868a868 (diff)
downloadchromium_src-4f18b677bf07e0d6e92bccc07e96854fa245ea17.zip
chromium_src-4f18b677bf07e0d6e92bccc07e96854fa245ea17.tar.gz
chromium_src-4f18b677bf07e0d6e92bccc07e96854fa245ea17.tar.bz2
Pulling in new gyp version with 'none' type workaround.
Review URL: http://codereview.chromium.org/149447 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20368 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'google_update')
-rw-r--r--google_update/google_update.gyp8
1 files changed, 7 insertions, 1 deletions
diff --git a/google_update/google_update.gyp b/google_update/google_update.gyp
index 40f95e5..c5e41e6 100644
--- a/google_update/google_update.gyp
+++ b/google_update/google_update.gyp
@@ -9,7 +9,6 @@
'targets': [
{
'target_name': 'google_update',
- 'type': 'none',
'msvs_guid': '4052059A-D72B-4183-B5C2-9D1B099E9E35',
'sources': [
'google_update_idl.idl',
@@ -22,6 +21,13 @@
'<(INTERMEDIATE_DIR)/../google_update',
],
},
+ 'conditions': [
+ ['OS=="win"', {
+ 'type': 'utility',
+ },{
+ 'type': 'none',
+ }],
+ ],
},
],
}