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

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: FinalEdits 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_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 398 matching lines...) Expand 10 before | Expand all | Expand 10 after
409 '../ash/ash.gyp:ash_unittests', 409 '../ash/ash.gyp:ash_unittests',
410 ], 410 ],
411 }], 411 }],
412 ['disable_nacl==0', { 412 ['disable_nacl==0', {
413 'dependencies': [ 413 'dependencies': [
414 '../components/nacl.gyp:nacl_loader_unittests', 414 '../components/nacl.gyp:nacl_loader_unittests',
415 ], 415 ],
416 }], 416 }],
417 ['disable_nacl==0 and disable_nacl_untrusted==0', { 417 ['disable_nacl==0 and disable_nacl_untrusted==0', {
418 'dependencies': [ 418 'dependencies': [
419 '../mojo/mojo_nacl.gyp:*',
419 '../testing/gtest_nacl.gyp:*', 420 '../testing/gtest_nacl.gyp:*',
420 ], 421 ],
421 }], 422 }],
422 ], 423 ],
423 }, # target_name: chromium_builder_tests 424 }, # target_name: chromium_builder_tests
424 ], 425 ],
425 'conditions': [ 426 'conditions': [
426 ['OS!="ios"', { 427 ['OS!="ios"', {
427 'targets': [ 428 'targets': [
428 { 429 {
(...skipping 862 matching lines...) Expand 10 before | Expand all | Expand 10 after
1291 'dependencies': [ 1292 'dependencies': [
1292 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1293 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1293 '../ui/views/views.gyp:views', 1294 '../ui/views/views.gyp:views',
1294 '../ui/views/views.gyp:views_unittests', 1295 '../ui/views/views.gyp:views_unittests',
1295 ], 1296 ],
1296 }, # target_name: macviews_builder 1297 }, # target_name: macviews_builder
1297 ], # targets 1298 ], # targets
1298 }], # os=='mac' and toolkit_views==1 1299 }], # os=='mac' and toolkit_views==1
1299 ], # conditions 1300 ], # conditions
1300 } 1301 }
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