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

Side by Side Diff: build/all.gyp

Issue 826393003: Split mojo_nacl.gyp to fix ARM builds. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 11 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 | mojo/mojo_nacl.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 # 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'. Only used on Android. 8 # compilation targets to 'All'. Only used on Android.
9 'android_app_targets%': [], 9 'android_app_targets%': [],
10 }, 10 },
(...skipping 457 matching lines...) Expand 10 before | Expand all | Expand 10 after
468 '../ash/ash.gyp:ash_unittests', 468 '../ash/ash.gyp:ash_unittests',
469 ], 469 ],
470 }], 470 }],
471 ['disable_nacl==0', { 471 ['disable_nacl==0', {
472 'dependencies': [ 472 'dependencies': [
473 '../components/nacl.gyp:nacl_loader_unittests', 473 '../components/nacl.gyp:nacl_loader_unittests',
474 ], 474 ],
475 }], 475 }],
476 ['disable_nacl==0 and disable_nacl_untrusted==0', { 476 ['disable_nacl==0 and disable_nacl_untrusted==0', {
477 'dependencies': [ 477 'dependencies': [
478 '../mojo/mojo_nacl.gyp:mojo_nacl', 478 '../mojo/mojo_nacl_untrusted.gyp:libmojo',
479 '../mojo/mojo_nacl.gyp:monacl_codegen', 479 '../mojo/mojo_nacl.gyp:monacl_codegen',
480 '../mojo/mojo_nacl.gyp:monacl_sel', 480 '../mojo/mojo_nacl.gyp:monacl_sel',
481 '../mojo/mojo_nacl.gyp:monacl_shell', 481 '../mojo/mojo_nacl.gyp:monacl_shell',
482 ], 482 ],
483 }], 483 }],
484 ], 484 ],
485 }, # target_name: chromium_builder_tests 485 }, # target_name: chromium_builder_tests
486 ], 486 ],
487 'conditions': [ 487 'conditions': [
488 ['OS!="ios"', { 488 ['OS!="ios"', {
(...skipping 912 matching lines...) Expand 10 before | Expand all | Expand 10 after
1401 'dependencies': [ 1401 'dependencies': [
1402 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1402 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1403 '../ui/views/views.gyp:views', 1403 '../ui/views/views.gyp:views',
1404 '../ui/views/views.gyp:views_unittests', 1404 '../ui/views/views.gyp:views_unittests',
1405 ], 1405 ],
1406 }, # target_name: macviews_builder 1406 }, # target_name: macviews_builder
1407 ], # targets 1407 ], # targets
1408 }], # os=='mac' and toolkit_views==1 1408 }], # os=='mac' and toolkit_views==1
1409 ], # conditions 1409 ], # conditions
1410 } 1410 }
OLDNEW
« no previous file with comments | « no previous file | mojo/mojo_nacl.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698