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

Side by Side Diff: build/all.gyp

Issue 1279133006: Removed unused mojo_nacl code and GYP targets. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: - -l Created 5 years, 4 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/gn_migration.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 # A hook that can be overridden in other repositories to add additional 7 # A hook that can be overridden in other repositories to add additional
8 # compilation targets to 'All'. 8 # compilation targets to 'All'.
9 'app_targets%': [], 9 'app_targets%': [],
10 # For Android-specific targets. 10 # For Android-specific targets.
(...skipping 476 matching lines...) Expand 10 before | Expand all | Expand 10 after
487 ['disable_nacl==0', { 487 ['disable_nacl==0', {
488 'dependencies': [ 488 'dependencies': [
489 '../components/nacl.gyp:nacl_loader_unittests', 489 '../components/nacl.gyp:nacl_loader_unittests',
490 ], 490 ],
491 }], 491 }],
492 ['disable_nacl==0 and disable_nacl_untrusted==0 and enable_nacl_nonsfi_t est==1', { 492 ['disable_nacl==0 and disable_nacl_untrusted==0 and enable_nacl_nonsfi_t est==1', {
493 'dependencies': [ 493 'dependencies': [
494 '../components/nacl.gyp:nacl_helper_nonsfi_unittests', 494 '../components/nacl.gyp:nacl_helper_nonsfi_unittests',
495 ], 495 ],
496 }], 496 }],
497 ['disable_nacl==0 and disable_nacl_untrusted==0', {
498 'dependencies': [
499 '../mojo/mojo_nacl_untrusted.gyp:libmojo',
500 '../mojo/mojo_nacl.gyp:monacl_codegen',
501 '../mojo/mojo_nacl.gyp:monacl_sel',
502 '../mojo/mojo_nacl.gyp:monacl_shell',
503 ],
504 }],
505 ], 497 ],
506 }, # target_name: chromium_builder_tests 498 }, # target_name: chromium_builder_tests
507 ], 499 ],
508 'conditions': [ 500 'conditions': [
509 # TODO(GYP): make gn_migration.gypi work unconditionally. 501 # TODO(GYP): make gn_migration.gypi work unconditionally.
510 ['OS=="mac" or OS=="win" or (OS=="linux" and target_arch=="x64" and chromeca st==0)', { 502 ['OS=="mac" or OS=="win" or (OS=="linux" and target_arch=="x64" and chromeca st==0)', {
511 'includes': [ 503 'includes': [
512 'gn_migration.gypi', 504 'gn_migration.gypi',
513 ], 505 ],
514 }], 506 }],
(...skipping 930 matching lines...) Expand 10 before | Expand all | Expand 10 after
1445 'dependencies': [ 1437 'dependencies': [
1446 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1438 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1447 '../ui/views/views.gyp:views', 1439 '../ui/views/views.gyp:views',
1448 '../ui/views/views.gyp:views_unittests', 1440 '../ui/views/views.gyp:views_unittests',
1449 ], 1441 ],
1450 }, # target_name: macviews_builder 1442 }, # target_name: macviews_builder
1451 ], # targets 1443 ], # targets
1452 }], # os=='mac' and toolkit_views==1 1444 }], # os=='mac' and toolkit_views==1
1453 ], # conditions 1445 ], # conditions
1454 } 1446 }
OLDNEW
« no previous file with comments | « no previous file | build/gn_migration.gypi » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698