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

Side by Side Diff: build/all.gyp

Issue 1133483002: WIP: Non-SFI mode: Enable nacl_helper_nonsfi_unittests. Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 7 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 | components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.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) 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 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
486 ], 486 ],
487 }], 487 }],
488 ['disable_nacl==0 and disable_nacl_untrusted==0', { 488 ['disable_nacl==0 and disable_nacl_untrusted==0', {
489 'dependencies': [ 489 'dependencies': [
490 '../mojo/mojo_nacl_untrusted.gyp:libmojo', 490 '../mojo/mojo_nacl_untrusted.gyp:libmojo',
491 '../mojo/mojo_nacl.gyp:monacl_codegen', 491 '../mojo/mojo_nacl.gyp:monacl_codegen',
492 '../mojo/mojo_nacl.gyp:monacl_sel', 492 '../mojo/mojo_nacl.gyp:monacl_sel',
493 '../mojo/mojo_nacl.gyp:monacl_shell', 493 '../mojo/mojo_nacl.gyp:monacl_shell',
494 ], 494 ],
495 }], 495 }],
496 ['disable_nacl==0 and disable_nacl_untrusted==0 and OS=="linux"', {
497 'dependencies': [
498 '../components/nacl_nonsfi.gyp:nacl_helper_nonsfi_unittests',
499 ],
500 }],
496 ], 501 ],
497 }, # target_name: chromium_builder_tests 502 }, # target_name: chromium_builder_tests
498 ], 503 ],
499 'conditions': [ 504 'conditions': [
500 # TODO(GYP): make gn_migration.gypi work unconditionally. 505 # TODO(GYP): make gn_migration.gypi work unconditionally.
501 ['OS=="mac" or OS=="win" or (OS=="linux" and target_arch=="x64" and chromeca st==0)', { 506 ['OS=="mac" or OS=="win" or (OS=="linux" and target_arch=="x64" and chromeca st==0)', {
502 'includes': [ 507 'includes': [
503 'gn_migration.gypi', 508 'gn_migration.gypi',
504 ], 509 ],
505 }], 510 }],
(...skipping 894 matching lines...) Expand 10 before | Expand all | Expand 10 after
1400 'dependencies': [ 1405 'dependencies': [
1401 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1406 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1402 '../ui/views/views.gyp:views', 1407 '../ui/views/views.gyp:views',
1403 '../ui/views/views.gyp:views_unittests', 1408 '../ui/views/views.gyp:views_unittests',
1404 ], 1409 ],
1405 }, # target_name: macviews_builder 1410 }, # target_name: macviews_builder
1406 ], # targets 1411 ], # targets
1407 }], # os=='mac' and toolkit_views==1 1412 }], # os=='mac' and toolkit_views==1
1408 ], # conditions 1413 ], # conditions
1409 } 1414 }
OLDNEW
« no previous file with comments | « no previous file | components/nacl/loader/nonsfi/nonsfi_sandbox_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698