Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(353)

Side by Side Diff: third_party/tcmalloc/tcmalloc.gyp

Issue 155371: Switching in new gyp version (which changes 'none' back to how it was before)... (Closed) Base URL: svn://chrome-svn.corp.google.com/chrome/trunk/src/
Patch Set: '' Created 11 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
« no previous file with comments | « google_update/google_update.gyp ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2009 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 'includes': [ 6 'includes': [
7 '../../build/common.gypi', 7 '../../build/common.gypi',
8 ], 8 ],
9 'targets': [ 9 'targets': [
10 { 10 {
(...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after
68 'msvs_settings': { 68 'msvs_settings': {
69 'VCCLCompilerTool': { 69 'VCCLCompilerTool': {
70 'RuntimeLibrary': '0', 70 'RuntimeLibrary': '0',
71 }, 71 },
72 }, 72 },
73 }, 73 },
74 }, 74 },
75 }, 75 },
76 { 76 {
77 'target_name': 'libcmt', 77 'target_name': 'libcmt',
78 'conditions': [ 78 'type': 'none',
79 ['OS=="win"', {
80 'type': 'utility',
81 },{
82 'type': 'none',
83 }],
84 ],
85 'actions': [ 79 'actions': [
86 { 80 {
87 'action_name': 'libcmt', 81 'action_name': 'libcmt',
88 'inputs': [ 82 'inputs': [
89 'prep_libc.sh', 83 'prep_libc.sh',
90 ], 84 ],
91 'outputs': [ 85 'outputs': [
92 '<(SHARED_INTERMEDIATE_DIR)/tcmalloc/libcmt.lib', 86 '<(SHARED_INTERMEDIATE_DIR)/tcmalloc/libcmt.lib',
93 ], 87 ],
94 'action': [ 88 'action': [
95 './prep_libc.sh', 89 './prep_libc.sh',
96 '$(VCInstallDir)lib', 90 '$(VCInstallDir)lib',
97 '<(SHARED_INTERMEDIATE_DIR)/tcmalloc', 91 '<(SHARED_INTERMEDIATE_DIR)/tcmalloc',
98 ], 92 ],
99 }, 93 },
100 ], 94 ],
101 }, 95 },
102 ], 96 ],
103 } 97 }
OLDNEW
« no previous file with comments | « google_update/google_update.gyp ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698