From eb10a660d4fee42c3b297764a6e44a360b600bd4 Mon Sep 17 00:00:00 2001
From: "bradnelson@chromium.org"
 <bradnelson@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 10 Jul 2009 20:37:47 +0000
Subject: [PATCH] Switching in new gyp version (which changes 'none' back to
 how it was before). Updating installer_util_strings to use dummy_executable.

BUG=None
TEST=None

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

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@20408 0039d316-1c4b-4281-b951-d872f2087c98
---
 DEPS                              | 2 +-
 chrome/installer/installer.gyp    | 2 +-
 google_update/google_update.gyp   | 8 +-------
 third_party/tcmalloc/tcmalloc.gyp | 8 +-------
 4 files changed, 4 insertions(+), 16 deletions(-)

diff --git a/DEPS b/DEPS
index 79b848f50..b37f491be 100644
--- a/DEPS
+++ b/DEPS
@@ -29,7 +29,7 @@ deps = {
 
   # TODO(mark): Remove once this has moved into depot_tools.
   "src/tools/gyp":
-    "http://gyp.googlecode.com/svn/trunk@544",
+    "http://gyp.googlecode.com/svn/trunk@545",
 
   "src/v8":
     "http://v8.googlecode.com/svn/trunk@2412",
diff --git a/chrome/installer/installer.gyp b/chrome/installer/installer.gyp
index 667bb1b99..6992aa0dc 100644
--- a/chrome/installer/installer.gyp
+++ b/chrome/installer/installer.gyp
@@ -276,7 +276,7 @@
         },
         {
           'target_name': 'installer_util_strings',
-          'type': 'none',
+          'type': 'dummy_executable',
           'msvs_guid': '0026A376-C4F1-4575-A1BA-578C69F07013',
           'actions': [
             {
diff --git a/google_update/google_update.gyp b/google_update/google_update.gyp
index c5e41e630..40f95e5ea 100644
--- a/google_update/google_update.gyp
+++ b/google_update/google_update.gyp
@@ -9,6 +9,7 @@
   'targets': [
     {
       'target_name': 'google_update',
+      'type': 'none',
       'msvs_guid': '4052059A-D72B-4183-B5C2-9D1B099E9E35',
       'sources': [
         'google_update_idl.idl',
@@ -21,13 +22,6 @@
           '<(INTERMEDIATE_DIR)/../google_update',
         ],
       },
-      'conditions': [
-        ['OS=="win"', {
-          'type': 'utility',
-        },{
-          'type': 'none',
-        }],
-      ],
     },
   ],
 }
diff --git a/third_party/tcmalloc/tcmalloc.gyp b/third_party/tcmalloc/tcmalloc.gyp
index ddef91f1b..43fc60dbb 100644
--- a/third_party/tcmalloc/tcmalloc.gyp
+++ b/third_party/tcmalloc/tcmalloc.gyp
@@ -75,13 +75,7 @@
     },
     {
       'target_name': 'libcmt',
-      'conditions': [
-        ['OS=="win"', {
-          'type': 'utility',
-        },{
-          'type': 'none',
-        }],
-      ],
+      'type': 'none',
       'actions': [
         {
           'action_name': 'libcmt',