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

Side by Side Diff: build/all.gyp

Issue 948323003: Fix the definition of the 'blink_tests' target in build/all.gyp. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 years, 10 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 | no next file » | 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'. 8 # compilation targets to 'All'.
9 'app_targets%': [], 9 'app_targets%': [],
10 # For Android-specific targets. 10 # For Android-specific targets.
(...skipping 602 matching lines...) Expand 10 before | Expand all | Expand 10 after
613 ], 613 ],
614 }], 614 }],
615 ['OS=="linux"', { 615 ['OS=="linux"', {
616 'dependencies': [ 616 'dependencies': [
617 '../dbus/dbus.gyp:dbus_unittests', 617 '../dbus/dbus.gyp:dbus_unittests',
618 '../sandbox/sandbox.gyp:sandbox_linux_unittests', 618 '../sandbox/sandbox.gyp:sandbox_linux_unittests',
619 ], 619 ],
620 }], 620 }],
621 ], 621 ],
622 }, 622 },
623 ]},
624 ], # OS!="ios" and OS!="android"
625 ['OS!="iOS"', {
626 'targets': [
623 { 627 {
624 'target_name': 'blink_tests', 628 'target_name': 'blink_tests',
625 'type': 'none', 629 'type': 'none',
626 'dependencies': [ 630 'dependencies': [
627 '../third_party/WebKit/public/all.gyp:all_blink', 631 '../third_party/WebKit/public/all.gyp:all_blink',
628 ], 632 ],
629 'conditions': [ 633 'conditions': [
630 ['OS=="android"', { 634 ['OS=="android"', {
631 'dependencies': [ 635 'dependencies': [
632 '../content/content_shell_and_tests.gyp:content_shell_apk', 636 '../content/content_shell_and_tests.gyp:content_shell_apk',
(...skipping 841 matching lines...) Expand 10 before | Expand all | Expand 10 after
1474 'dependencies': [ 1478 'dependencies': [
1475 '../ui/views/examples/examples.gyp:views_examples_with_content_exe', 1479 '../ui/views/examples/examples.gyp:views_examples_with_content_exe',
1476 '../ui/views/views.gyp:views', 1480 '../ui/views/views.gyp:views',
1477 '../ui/views/views.gyp:views_unittests', 1481 '../ui/views/views.gyp:views_unittests',
1478 ], 1482 ],
1479 }, # target_name: macviews_builder 1483 }, # target_name: macviews_builder
1480 ], # targets 1484 ], # targets
1481 }], # os=='mac' and toolkit_views==1 1485 }], # os=='mac' and toolkit_views==1
1482 ], # conditions 1486 ], # conditions
1483 } 1487 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698