diff options
| -rw-r--r-- | DEPS | 2 | ||||
| -rw-r--r-- | chrome/installer/installer.gyp | 2 | ||||
| -rw-r--r-- | google_update/google_update.gyp | 8 | ||||
| -rw-r--r-- | third_party/tcmalloc/tcmalloc.gyp | 8 |
4 files changed, 4 insertions, 16 deletions
@@ -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 667bb1b..6992aa0 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 c5e41e6..40f95e5 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 ddef91f..43fc60d 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', |