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

Side by Side Diff: chrome/chrome.gyp

Issue 542078: Adding a secondary mini_installer target for Chrome Frame. This will remove t... (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src/
Patch Set: '' Created 10 years, 11 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 | Annotate | Revision Log
« no previous file with comments | « build/common.gypi ('k') | chrome/chrome_exe.gypi » ('j') | 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) 2010 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2010 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 'variables': { 6 'variables': {
7 'chromium_code': 1, 7 'chromium_code': 1,
8 8
9 'variables': { 9 'variables': {
10 'version_py_path': 'tools/build/version.py', 10 'version_py_path': 'tools/build/version.py',
(...skipping 1202 matching lines...) Expand 10 before | Expand all | Expand 10 after
1213 { 1213 {
1214 # TODO(sgk): remove this when we change the buildbots to 1214 # TODO(sgk): remove this when we change the buildbots to
1215 # use the generated build\all.sln file to build the world. 1215 # use the generated build\all.sln file to build the world.
1216 'target_name': 'pull_in_all', 1216 'target_name': 'pull_in_all',
1217 'type': 'none', 1217 'type': 'none',
1218 'dependencies': [ 1218 'dependencies': [
1219 'installer/mini_installer.gyp:*', 1219 'installer/mini_installer.gyp:*',
1220 'installer/installer.gyp:*', 1220 'installer/installer.gyp:*',
1221 '../app/app.gyp:*', 1221 '../app/app.gyp:*',
1222 '../base/base.gyp:*', 1222 '../base/base.gyp:*',
1223 '../chrome_frame/chrome_frame.gyp:*',
1223 '../ipc/ipc.gyp:*', 1224 '../ipc/ipc.gyp:*',
1224 '../media/media.gyp:*', 1225 '../media/media.gyp:*',
1225 '../net/net.gyp:*', 1226 '../net/net.gyp:*',
1226 '../printing/printing.gyp:*', 1227 '../printing/printing.gyp:*',
1227 '../rlz/rlz.gyp:*', 1228 '../rlz/rlz.gyp:*',
1228 '../sdch/sdch.gyp:*', 1229 '../sdch/sdch.gyp:*',
1229 '../skia/skia.gyp:*', 1230 '../skia/skia.gyp:*',
1230 '../testing/gmock.gyp:*', 1231 '../testing/gmock.gyp:*',
1231 '../testing/gtest.gyp:*', 1232 '../testing/gtest.gyp:*',
1232 '../third_party/bsdiff/bsdiff.gyp:*', 1233 '../third_party/bsdiff/bsdiff.gyp:*',
(...skipping 22 matching lines...) Expand all
1255 '../sandbox/sandbox.gyp:*', 1256 '../sandbox/sandbox.gyp:*',
1256 '../tools/memory_watcher/memory_watcher.gyp:*', 1257 '../tools/memory_watcher/memory_watcher.gyp:*',
1257 '../v8/tools/gyp/v8.gyp:v8_shell', 1258 '../v8/tools/gyp/v8.gyp:v8_shell',
1258 ], 1259 ],
1259 'conditions': [ 1260 'conditions': [
1260 ['win_use_allocator_shim==1', { 1261 ['win_use_allocator_shim==1', {
1261 'dependencies': [ 1262 'dependencies': [
1262 '../base/allocator/allocator.gyp:*', 1263 '../base/allocator/allocator.gyp:*',
1263 ], 1264 ],
1264 }], 1265 }],
1265 ['chrome_frame_define==1', {
1266 'dependencies': [
1267 '../chrome_frame/chrome_frame.gyp:*',
1268 ],
1269 }],
1270 ], 1266 ],
1271 }, 1267 },
1272 { 1268 {
1273 'target_name': 'chrome_dll_version', 1269 'target_name': 'chrome_dll_version',
1274 'type': 'none', 1270 'type': 'none',
1275 #'msvs_guid': '414D4D24-5D65-498B-A33F-3A29AD3CDEDC', 1271 #'msvs_guid': '414D4D24-5D65-498B-A33F-3A29AD3CDEDC',
1276 'dependencies': [ 1272 'dependencies': [
1277 '../build/util/build_util.gyp:lastchange', 1273 '../build/util/build_util.gyp:lastchange',
1278 ], 1274 ],
1279 'direct_dependent_settings': { 1275 'direct_dependent_settings': {
(...skipping 225 matching lines...) Expand 10 before | Expand all | Expand 10 after
1505 }], # targets 1501 }], # targets
1506 }], # OS=="linux" or OS=="freebsd" 1502 }], # OS=="linux" or OS=="freebsd"
1507 ], # 'conditions' 1503 ], # 'conditions'
1508 } 1504 }
1509 1505
1510 # Local Variables: 1506 # Local Variables:
1511 # tab-width:2 1507 # tab-width:2
1512 # indent-tabs-mode:nil 1508 # indent-tabs-mode:nil
1513 # End: 1509 # End:
1514 # vim: set expandtab tabstop=2 shiftwidth=2: 1510 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW
« no previous file with comments | « build/common.gypi ('k') | chrome/chrome_exe.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698