summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-08 20:20:05 +0000
committerbradnelson@chromium.org <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-09-08 20:20:05 +0000
commit2b55f08bd457f3d0feba66093aed584e6817ce9e (patch)
treee55d5348430be37ef6611f90a74f43f4047ad4eb
parent610c089bd27051ca8d2b983e784b31c533cbfef8 (diff)
downloadchromium_src-2b55f08bd457f3d0feba66093aed584e6817ce9e.zip
chromium_src-2b55f08bd457f3d0feba66093aed584e6817ce9e.tar.gz
chromium_src-2b55f08bd457f3d0feba66093aed584e6817ce9e.tar.bz2
Pulling in latest gyp.
Adjusting installer_util_strings to attempt to avoid incredibuild mysterious failure. BUG=None TEST=None TBR=gregoryd Review URL: http://codereview.chromium.org/200046 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@25652 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--DEPS2
-rw-r--r--chrome/installer/installer.gyp1
2 files changed, 2 insertions, 1 deletions
diff --git a/DEPS b/DEPS
index cf74e56..bff9157 100644
--- a/DEPS
+++ b/DEPS
@@ -34,7 +34,7 @@ deps = {
"http://protobuf.googlecode.com/svn/trunk@219",
"src/tools/gyp":
- "http://gyp.googlecode.com/svn/trunk@604",
+ "http://gyp.googlecode.com/svn/trunk@639",
"src/v8":
"http://v8.googlecode.com/svn/trunk@2811",
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
index b7ab828..0c22e4c 100644
--- a/chrome/installer/installer.gyp
+++ b/chrome/installer/installer.gyp
@@ -191,6 +191,7 @@
'<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.rc',
'<(SHARED_INTERMEDIATE_DIR)/installer_util_strings/installer_util_strings.h',
],
+ 'msvs_quote_cmd': 0,
'action': [
# The create_string_rc.py script requires the checked-in
# python.exe that has google modules installed, and