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

Side by Side Diff: trunk/src/build/all.gyp

Issue 466303002: Revert 289216 "Create NaCl build of gtest." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 4 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 | Annotate | Revision Log
« no previous file with comments | « no previous file | trunk/src/testing/gtest.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 391 matching lines...) Expand 10 before | Expand all | Expand 10 after
402 ['use_ash==1', { 402 ['use_ash==1', {
403 'dependencies': [ 403 'dependencies': [
404 '../ash/ash.gyp:ash_unittests', 404 '../ash/ash.gyp:ash_unittests',
405 ], 405 ],
406 }], 406 }],
407 ['disable_nacl==0', { 407 ['disable_nacl==0', {
408 'dependencies': [ 408 'dependencies': [
409 '../components/nacl.gyp:nacl_loader_unittests', 409 '../components/nacl.gyp:nacl_loader_unittests',
410 ], 410 ],
411 }], 411 }],
412 ['disable_nacl==0 and disable_nacl_untrusted==0', {
413 'dependencies': [
414 '../testing/gtest_nacl.gyp:*',
415 ],
416 }],
417 ], 412 ],
418 }, # target_name: chromium_builder_tests 413 }, # target_name: chromium_builder_tests
419 ], 414 ],
420 'conditions': [ 415 'conditions': [
421 ['OS!="ios"', { 416 ['OS!="ios"', {
422 'targets': [ 417 'targets': [
423 { 418 {
424 'target_name': 'blink_tests', 419 'target_name': 'blink_tests',
425 'type': 'none', 420 'type': 'none',
426 'dependencies': [ 421 'dependencies': [
(...skipping 861 matching lines...) Expand 10 before | Expand all | Expand 10 after
1288 'dependencies': [ 1283 'dependencies': [
1289 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1284 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1290 '../ui/views/views.gyp:views', 1285 '../ui/views/views.gyp:views',
1291 '../ui/views/views.gyp:views_unittests', 1286 '../ui/views/views.gyp:views_unittests',
1292 ], 1287 ],
1293 }, # target_name: macviews_builder 1288 }, # target_name: macviews_builder
1294 ], # targets 1289 ], # targets
1295 }], # os=='mac' and toolkit_views==1 1290 }], # os=='mac' and toolkit_views==1
1296 ], # conditions 1291 ], # conditions
1297 } 1292 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/testing/gtest.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698