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

Side by Side Diff: ash/ash.gyp

Issue 1851213002: Remove sandbox on Windows. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: fix nacl compile issues Created 4 years, 8 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 | « no previous file | build/all.gyp » ('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 # These files lists are shared with the GN build. 8 # These files lists are shared with the GN build.
9 'ash_sources': [ 9 'ash_sources': [
10 'accelerators/accelerator_commands.cc', 10 'accelerators/accelerator_commands.cc',
(...skipping 1288 matching lines...) Expand 10 before | Expand all | Expand 10 after
1299 'type': 'static_library', 1299 'type': 'static_library',
1300 'dependencies': [ 1300 'dependencies': [
1301 'ash_shell_lib', 1301 'ash_shell_lib',
1302 '../content/content_shell_and_tests.gyp:content_shell_lib', 1302 '../content/content_shell_and_tests.gyp:content_shell_lib',
1303 '../content/content.gyp:content', 1303 '../content/content.gyp:content',
1304 '../skia/skia.gyp:skia', 1304 '../skia/skia.gyp:skia',
1305 ], 1305 ],
1306 'sources': [ 1306 'sources': [
1307 '<@(ash_shell_with_content_lib_sources)', 1307 '<@(ash_shell_with_content_lib_sources)',
1308 ], 1308 ],
1309 'conditions': [
1310 ['OS=="win"', {
1311 'dependencies': [
1312 '../content/content.gyp:sandbox_helper_win',
1313 ],
1314 }],
1315 ],
1316 }, 1309 },
1317 { 1310 {
1318 # GN version: //ash:ash_shell_with_content 1311 # GN version: //ash:ash_shell_with_content
1319 'target_name': 'ash_shell_with_content', 1312 'target_name': 'ash_shell_with_content',
1320 'type': 'executable', 1313 'type': 'executable',
1321 'dependencies': [ 1314 'dependencies': [
1322 'ash_shell_lib_with_content', 1315 'ash_shell_lib_with_content',
1323 '../components/components.gyp:user_manager', 1316 '../components/components.gyp:user_manager',
1324 ], 1317 ],
1325 'sources': [ 1318 'sources': [
1326 'shell/content/shell_with_content_main.cc', 1319 'shell/content/shell_with_content_main.cc',
1327 ], 1320 ],
1328 'conditions': [ 1321 'conditions': [
1329 ['OS=="win"', { 1322 ['OS=="win"', {
1330 'msvs_settings': { 1323 'msvs_settings': {
1331 'VCLinkerTool': { 1324 'VCLinkerTool': {
1332 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS 1325 'SubSystem': '2', # Set /SUBSYSTEM:WINDOWS
1333 }, 1326 },
1334 }, 1327 },
1335 'dependencies': [
1336 '../sandbox/sandbox.gyp:sandbox',
1337 ],
1338 }], 1328 }],
1339 ['chromeos==1', { 1329 ['chromeos==1', {
1340 'dependencies': [ 1330 'dependencies': [
1341 '../device/bluetooth/bluetooth.gyp:device_bluetooth', 1331 '../device/bluetooth/bluetooth.gyp:device_bluetooth',
1342 ], 1332 ],
1343 }], 1333 }],
1344 ], 1334 ],
1345 }, 1335 },
1346 ], 1336 ],
1347 'conditions': [ 1337 'conditions': [
(...skipping 18 matching lines...) Expand all
1366 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck', 1356 '../tools/xdisplaycheck/xdisplaycheck.gyp:xdisplaycheck',
1367 ], 1357 ],
1368 } 1358 }
1369 ], 1359 ],
1370 ], 1360 ],
1371 }, 1361 },
1372 ], 1362 ],
1373 }], 1363 }],
1374 ], 1364 ],
1375 } 1365 }
OLDNEW
« no previous file with comments | « no previous file | build/all.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698