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

Side by Side Diff: BUILD.gn

Issue 1083683003: Speculative revert by sheriff (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Removed an unrelated commit that had accidentally slipped in. Created 5 years, 8 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 | DEPS » ('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) 2013 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2013 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 # This is the root build file for GN. GN will start processing by loading this 5 # This is the root build file for GN. GN will start processing by loading this
6 # file, and recursively load all dependencies until all dependencies are either 6 # file, and recursively load all dependencies until all dependencies are either
7 # resolved or known not to exist (which will cause the build to fail). So if 7 # resolved or known not to exist (which will cause the build to fail). So if
8 # you add a new build file, there must be some path of dependencies from this 8 # you add a new build file, there must be some path of dependencies from this
9 # file to your new one or GN won't know about it. 9 # file to your new one or GN won't know about it.
10 10
(...skipping 451 matching lines...) Expand 10 before | Expand all | Expand 10 after
462 462
463 if (!is_debug && !is_component_build) { 463 if (!is_debug && !is_component_build) {
464 deps += [ "//chrome/tools/service_discovery_sniffer" ] 464 deps += [ "//chrome/tools/service_discovery_sniffer" ]
465 } 465 }
466 466
467 if (toolkit_views) { 467 if (toolkit_views) {
468 deps += [ "//ui/app_list:app_list_demo" ] 468 deps += [ "//ui/app_list:app_list_demo" ]
469 } 469 }
470 470
471 if (use_x11) { 471 if (use_x11) {
472 deps += [ "//media:player_x11" ]
472 if (target_cpu != "arm") { 473 if (target_cpu != "arm") {
473 deps += [ "//gpu/tools/compositor_model_bench" ] 474 deps += [ "//gpu/tools/compositor_model_bench" ]
474 } 475 }
475 } 476 }
476 } 477 }
477 478
478 if (is_mac) { 479 if (is_mac) {
479 deps += [ 480 deps += [
480 "//breakpad:crash_inspector", 481 "//breakpad:crash_inspector",
481 "//breakpad:dump_syms", 482 "//breakpad:dump_syms",
(...skipping 299 matching lines...) Expand 10 before | Expand all | Expand 10 after
781 782
782 # Note: 783 # Note:
783 # (*) Fails but failures match GYP build at time of testing. 784 # (*) Fails but failures match GYP build at time of testing.
784 ] 785 ]
785 786
786 if (enable_nacl) { 787 if (enable_nacl) {
787 deps += [ "//components/nacl:nacl_loader_unittests" ] # PASSES 3/28/2015 788 deps += [ "//components/nacl:nacl_loader_unittests" ] # PASSES 3/28/2015
788 } 789 }
789 } 790 }
790 } 791 }
OLDNEW
« no previous file with comments | « no previous file | DEPS » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698