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

Side by Side Diff: chrome/chrome_exe.gypi

Issue 7839007: Revert nacl_helper while working out developer build issues (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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 | « no previous file | chrome/nacl/nacl_fork_delegate_linux.cc » ('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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'chrome_exe_target': 0, 8 'chrome_exe_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 435 matching lines...) Expand 10 before | Expand all | Expand 10 after
446 ], 446 ],
447 'dependencies': [ 447 'dependencies': [
448 'packed_extra_resources', 448 'packed_extra_resources',
449 'packed_resources', 449 'packed_resources',
450 # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp 450 # Copy Flash Player files to PRODUCT_DIR if applicable. Let the .gyp
451 # file decide what to do on a per-OS basis; on Mac, internal plugins 451 # file decide what to do on a per-OS basis; on Mac, internal plugins
452 # go inside the framework, so this dependency is in chrome_dll.gypi. 452 # go inside the framework, so this dependency is in chrome_dll.gypi.
453 '../third_party/adobe/flash/flash_player.gyp:flash_player', 453 '../third_party/adobe/flash/flash_player.gyp:flash_player',
454 ], 454 ],
455 }], 455 }],
456 ['OS=="linux"', {
457 'conditions': [
458 # For now, do not build nacl_helper on ARM or when disable_nacl=1.
459 ['disable_nacl!=1 and target_arch!="arm"', {
460 'dependencies': [
461 'nacl_helper_bootstrap',
462 'nacl_helper',
463 ],
464 }],
465 ],
466 }],
467 ['OS=="mac"', { 456 ['OS=="mac"', {
468 'dependencies': [ 457 'dependencies': [
469 # On Mac, make sure we've built chrome_dll, which contains all of 458 # On Mac, make sure we've built chrome_dll, which contains all of
470 # the library code with Chromium functionality. 459 # the library code with Chromium functionality.
471 'chrome_dll', 460 'chrome_dll',
472 ], 461 ],
473 }], 462 }],
474 ['OS=="win"', { 463 ['OS=="win"', {
475 'conditions': [ 464 'conditions': [
476 ['optimize_with_syzygy==1', { 465 ['optimize_with_syzygy==1', {
(...skipping 76 matching lines...) Expand 10 before | Expand all | Expand 10 after
553 'configurations': { 542 'configurations': {
554 'Common_Base': { 543 'Common_Base': {
555 'msvs_target_platform': 'x64', 544 'msvs_target_platform': 'x64',
556 }, 545 },
557 }, 546 },
558 }, 547 },
559 ], 548 ],
560 }], 549 }],
561 ], 550 ],
562 } 551 }
OLDNEW
« no previous file with comments | « no previous file | chrome/nacl/nacl_fork_delegate_linux.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698