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

Side by Side Diff: ash/ash.gyp

Issue 695913003: Add more allocator.gyp:allocator dependencies (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Fix two more; now i can build 'all' in 32-bit Created 6 years, 1 month 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 | « no previous file | chrome/chrome_tests.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) 2012 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2012 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 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome', 8 'grit_out_dir': '<(SHARED_INTERMEDIATE_DIR)/chrome',
9 # These files lists are shared with the GN build. 9 # These files lists are shared with the GN build.
10 'ash_sources': [ 10 'ash_sources': [
(...skipping 1233 matching lines...) Expand 10 before | Expand all | Expand 10 after
1244 }, 1244 },
1245 'dependencies': [ 1245 'dependencies': [
1246 '../sandbox/sandbox.gyp:sandbox', 1246 '../sandbox/sandbox.gyp:sandbox',
1247 ], 1247 ],
1248 }], 1248 }],
1249 ['chromeos==1', { 1249 ['chromeos==1', {
1250 'dependencies': [ 1250 'dependencies': [
1251 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1251 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1252 ], 1252 ],
1253 }], 1253 }],
1254 ['OS=="win" and component!="shared_library" and win_use_allocator_shim== 1', {
1255 'dependencies': [
1256 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
1257 ],
1258 }],
1254 ], 1259 ],
1255 }, 1260 },
1256 { 1261 {
1257 # GN version: //ash:ash_shell_unittests 1262 # GN version: //ash:ash_shell_unittests
1258 'target_name': 'ash_shell_unittests', 1263 'target_name': 'ash_shell_unittests',
1259 'type': 'executable', 1264 'type': 'executable',
1260 'dependencies': [ 1265 'dependencies': [
1261 '../base/base.gyp:test_support_base', 1266 '../base/base.gyp:test_support_base',
1262 '../components/components.gyp:user_manager', 1267 '../components/components.gyp:user_manager',
1263 '../content/content_shell_and_tests.gyp:test_support_content', 1268 '../content/content_shell_and_tests.gyp:test_support_content',
1264 '../skia/skia.gyp:skia', 1269 '../skia/skia.gyp:skia',
1265 '../testing/gtest.gyp:gtest', 1270 '../testing/gtest.gyp:gtest',
1266 '../ui/accessibility/accessibility.gyp:ax_gen', 1271 '../ui/accessibility/accessibility.gyp:ax_gen',
1267 'ash_shell_lib', 1272 'ash_shell_lib',
1268 'ash_test_support', 1273 'ash_test_support',
1269 ], 1274 ],
1270 'sources': [ 1275 'sources': [
1271 # Note: file list duplicated in GN build. 1276 # Note: file list duplicated in GN build.
1272 'shell/window_watcher_unittest.cc', 1277 'shell/window_watcher_unittest.cc',
1273 'test/ash_unittests.cc', 1278 'test/ash_unittests.cc',
1274 ], 1279 ],
1275 'conditions': [ 1280 'conditions': [
1276 ['chromeos==1', { 1281 ['chromeos==1', {
1277 'dependencies': [ 1282 'dependencies': [
1278 '../ui/display/display.gyp:display', 1283 '../ui/display/display.gyp:display',
1279 ], 1284 ],
1280 }], 1285 }],
1286 ['OS=="win" and component!="shared_library" and win_use_allocator_shim== 1', {
1287 'dependencies': [
1288 '<(DEPTH)/base/allocator/allocator.gyp:allocator',
1289 ],
1290 }],
1281 ], 1291 ],
1282 }, 1292 },
1283 ], 1293 ],
1284 'conditions': [ 1294 'conditions': [
1285 ['test_isolation_mode != "noop"', { 1295 ['test_isolation_mode != "noop"', {
1286 'targets': [ 1296 'targets': [
1287 { 1297 {
1288 'target_name': 'ash_unittests_run', 1298 'target_name': 'ash_unittests_run',
1289 'type': 'none', 1299 'type': 'none',
1290 'dependencies': [ 1300 'dependencies': [
1291 'ash_unittests', 1301 'ash_unittests',
1292 ], 1302 ],
1293 'includes': [ 1303 'includes': [
1294 '../build/isolate.gypi', 1304 '../build/isolate.gypi',
1295 ], 1305 ],
1296 'sources': [ 1306 'sources': [
1297 'ash_unittests.isolate', 1307 'ash_unittests.isolate',
1298 ], 1308 ],
1299 }, 1309 },
1300 ], 1310 ],
1301 }], 1311 }],
1302 ], 1312 ],
1303 } 1313 }
OLDNEW
« no previous file with comments | « no previous file | chrome/chrome_tests.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698