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

Side by Side Diff: build/all.gyp

Issue 385983008: Mojo + NaCl prototype. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: GYP edit Created 6 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
« no previous file with comments | « no previous file | mojo/mojo_public_tests.gypi » ('j') | mojo/mojo_variables.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 396 matching lines...) Expand 10 before | Expand all | Expand 10 after
407 '../ash/ash.gyp:ash_unittests', 407 '../ash/ash.gyp:ash_unittests',
408 ], 408 ],
409 }], 409 }],
410 ['disable_nacl==0', { 410 ['disable_nacl==0', {
411 'dependencies': [ 411 'dependencies': [
412 '../components/nacl.gyp:nacl_loader_unittests', 412 '../components/nacl.gyp:nacl_loader_unittests',
413 ], 413 ],
414 }], 414 }],
415 ['disable_nacl==0 and disable_nacl_untrusted==0', { 415 ['disable_nacl==0 and disable_nacl_untrusted==0', {
416 'dependencies': [ 416 'dependencies': [
417 '../testing/gtest_nacl.gyp:*', 417 '../mojo/monacl.gyp:*',
Mark Seaborn 2014/09/09 19:13:10 Why are you removing this? Shouldn't the new targ
Nick Bray (chromium) 2014/09/09 23:12:32 Done. I was misinterpreting the intent of this fi
418 ], 418 ],
419 }], 419 }],
420 ], 420 ],
421 }, # target_name: chromium_builder_tests 421 }, # target_name: chromium_builder_tests
422 ], 422 ],
423 'conditions': [ 423 'conditions': [
424 ['OS!="ios"', { 424 ['OS!="ios"', {
425 'targets': [ 425 'targets': [
426 { 426 {
427 'target_name': 'blink_tests', 427 'target_name': 'blink_tests',
(...skipping 860 matching lines...) Expand 10 before | Expand all | Expand 10 after
1288 'dependencies': [ 1288 'dependencies': [
1289 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1289 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1290 '../ui/views/views.gyp:views', 1290 '../ui/views/views.gyp:views',
1291 '../ui/views/views.gyp:views_unittests', 1291 '../ui/views/views.gyp:views_unittests',
1292 ], 1292 ],
1293 }, # target_name: macviews_builder 1293 }, # target_name: macviews_builder
1294 ], # targets 1294 ], # targets
1295 }], # os=='mac' and toolkit_views==1 1295 }], # os=='mac' and toolkit_views==1
1296 ], # conditions 1296 ], # conditions
1297 } 1297 }
OLDNEW
« no previous file with comments | « no previous file | mojo/mojo_public_tests.gypi » ('j') | mojo/mojo_variables.gypi » ('J')

Powered by Google App Engine
This is Rietveld 408576698