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

Side by Side Diff: chrome/browser/BUILD.gn

Issue 2009983002: Guard dbus component and config with assert(use_dbus) (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Created 4 years, 6 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
OLDNEW
1 # Copyright 2014 The Chromium Authors. All rights reserved. 1 # Copyright 2014 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 import("//build/config/chrome_build.gni") 5 import("//build/config/chrome_build.gni")
6 import("//build/config/crypto.gni") 6 import("//build/config/crypto.gni")
7 import("//build/config/features.gni") 7 import("//build/config/features.gni")
8 import("//build/config/ui.gni") 8 import("//build/config/ui.gni")
9 import("//chrome/common/features.gni") 9 import("//chrome/common/features.gni")
10 import("//media/media_options.gni") 10 import("//media/media_options.gni")
(...skipping 849 matching lines...) Expand 10 before | Expand all | Expand 10 after
860 if (toolkit_views) { 860 if (toolkit_views) {
861 deps += [ 861 deps += [
862 "//ui/views", 862 "//ui/views",
863 "//ui/views/controls/webview", 863 "//ui/views/controls/webview",
864 ] 864 ]
865 } 865 }
866 } 866 }
867 867
868 if (is_linux) { 868 if (is_linux) {
869 if (use_aura) { 869 if (use_aura) {
870 configs += [ "//build/config/linux/dbus" ] 870 deps += [ "//build/linux:fontconfig" ]
871 deps += [ 871
872 "//build/linux:fontconfig", 872 if (use_dbus) {
873 "//dbus", 873 configs += [ "//build/config/linux/dbus" ]
slan 2016/05/25 22:35:18 nit: rm - we get this for free via //dbus.
mbjorge 2016/05/31 20:38:39 Done
874 ] 874 deps += [ "//dbus" ]
875 }
875 } 876 }
876 if (use_x11) { 877 if (use_x11) {
877 configs += [ "//build/config/linux:x11" ] 878 configs += [ "//build/config/linux:x11" ]
878 deps += [ "//ui/gfx/x" ] 879 deps += [ "//ui/gfx/x" ]
879 } 880 }
880 } 881 }
881 882
882 if (is_linux || is_win) { 883 if (is_linux || is_win) {
883 sources += rebase_path(gypi_values.chrome_browser_non_mac_desktop_sources, 884 sources += rebase_path(gypi_values.chrome_browser_non_mac_desktop_sources,
884 ".", 885 ".",
(...skipping 455 matching lines...) Expand 10 before | Expand all | Expand 10 after
1340 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome") 1341 rebase_path(gypi_values.chrome_browser_rlz_sources, ".", "//chrome")
1341 deps = [ 1342 deps = [
1342 "//components/google/core/browser", 1343 "//components/google/core/browser",
1343 "//components/omnibox/browser", 1344 "//components/omnibox/browser",
1344 "//components/rlz", 1345 "//components/rlz",
1345 "//components/search_engines", 1346 "//components/search_engines",
1346 "//rlz:rlz_lib", 1347 "//rlz:rlz_lib",
1347 ] 1348 ]
1348 } 1349 }
1349 } 1350 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698