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

Side by Side Diff: build/all.gyp

Issue 782693004: Update mojo sdk to rev f6c8ec07c01deebc13178d516225fd12695c3dc2 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: hack mojo_system_impl gypi for android :| Created 6 years 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/cc/BUILD.gn » ('j') | mojo/edk/mojo_edk_system_impl.gypi » ('J')
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 445 matching lines...) Expand 10 before | Expand all | Expand 10 after
456 '../ash/ash.gyp:ash_unittests', 456 '../ash/ash.gyp:ash_unittests',
457 ], 457 ],
458 }], 458 }],
459 ['disable_nacl==0', { 459 ['disable_nacl==0', {
460 'dependencies': [ 460 'dependencies': [
461 '../components/nacl.gyp:nacl_loader_unittests', 461 '../components/nacl.gyp:nacl_loader_unittests',
462 ], 462 ],
463 }], 463 }],
464 ['disable_nacl==0 and disable_nacl_untrusted==0', { 464 ['disable_nacl==0 and disable_nacl_untrusted==0', {
465 'dependencies': [ 465 'dependencies': [
466 '../mojo/mojo_nacl.gyp:*', 466 '../mojo/mojo_nacl.gyp:mojo_nacl',
467 '../testing/gtest_nacl.gyp:*', 467 '../mojo/mojo_nacl.gyp:monacl_codegen',
468 '../mojo/mojo_nacl.gyp:monacl_sel',
469 '../mojo/mojo_nacl.gyp:monacl_shell',
468 ], 470 ],
469 }], 471 }],
470 ], 472 ],
471 }, # target_name: chromium_builder_tests 473 }, # target_name: chromium_builder_tests
472 ], 474 ],
473 'conditions': [ 475 'conditions': [
474 ['OS!="ios"', { 476 ['OS!="ios"', {
475 'targets': [ 477 'targets': [
476 { 478 {
477 'target_name': 'blink_tests', 479 'target_name': 'blink_tests',
(...skipping 902 matching lines...) Expand 10 before | Expand all | Expand 10 after
1380 'dependencies': [ 1382 'dependencies': [
1381 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1383 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1382 '../ui/views/views.gyp:views', 1384 '../ui/views/views.gyp:views',
1383 '../ui/views/views.gyp:views_unittests', 1385 '../ui/views/views.gyp:views_unittests',
1384 ], 1386 ],
1385 }, # target_name: macviews_builder 1387 }, # target_name: macviews_builder
1386 ], # targets 1388 ], # targets
1387 }], # os=='mac' and toolkit_views==1 1389 }], # os=='mac' and toolkit_views==1
1388 ], # conditions 1390 ], # conditions
1389 } 1391 }
OLDNEW
« no previous file with comments | « no previous file | mojo/cc/BUILD.gn » ('j') | mojo/edk/mojo_edk_system_impl.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698