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

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

Issue 1328883002: move gconf config inside use_gconf block (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 5 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 | 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 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 assert(is_linux, "This file should only be referenced on Linux") 5 assert(is_linux, "This file should only be referenced on Linux")
6 6
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 9
10 component("libgtk2ui") { 10 component("libgtk2ui") {
(...skipping 43 matching lines...) Expand 10 before | Expand all | Expand 10 after
54 "unity_service.h", 54 "unity_service.h",
55 "x11_input_method_context_impl_gtk2.cc", 55 "x11_input_method_context_impl_gtk2.cc",
56 "x11_input_method_context_impl_gtk2.h", 56 "x11_input_method_context_impl_gtk2.h",
57 ] 57 ]
58 58
59 if (use_gconf) { 59 if (use_gconf) {
60 sources += [ 60 sources += [
61 "gconf_listener.cc", 61 "gconf_listener.cc",
62 "gconf_listener.h", 62 "gconf_listener.h",
63 ] 63 ]
64 configs += [ "//build/config/linux:gconf" ]
64 } 65 }
65 defines = [ "LIBGTK2UI_IMPLEMENTATION" ] 66 defines = [ "LIBGTK2UI_IMPLEMENTATION" ]
66 67
67 configs += [ "//build/config/linux:gconf" ]
68
69 if (use_cups) { 68 if (use_cups) {
70 configs += [ "//printing:cups" ] 69 configs += [ "//printing:cups" ]
71 } 70 }
72 71
73 # GTK2 pulls pangoft2 as dependency, and pangoft2 depends on harfbuzz. 72 # GTK2 pulls pangoft2 as dependency, and pangoft2 depends on harfbuzz.
74 # To avoid missing indirectly referenced harfbuzz symbols from pango, 73 # To avoid missing indirectly referenced harfbuzz symbols from pango,
75 # some hack is required when bundled harfbuzz is used and component build is 74 # some hack is required when bundled harfbuzz is used and component build is
76 # disabled. 75 # disabled.
77 # See crbug.com/462689 for details. 76 # See crbug.com/462689 for details.
78 all_dependent_configs = [ "//third_party/harfbuzz-ng:pangoft2_link_hack" ] 77 all_dependent_configs = [ "//third_party/harfbuzz-ng:pangoft2_link_hack" ]
(...skipping 51 matching lines...) Expand 10 before | Expand all | Expand 10 after
130 "//build/config/linux/gtk3", 129 "//build/config/linux/gtk3",
131 "//build/config/linux/gtk3:gtkprint3", 130 "//build/config/linux/gtk3:gtkprint3",
132 ] 131 ]
133 } else { 132 } else {
134 deps += [ 133 deps += [
135 "//build/config/linux/gtk2", 134 "//build/config/linux/gtk2",
136 "//build/config/linux/gtk2:gtkprint2", 135 "//build/config/linux/gtk2:gtkprint2",
137 ] 136 ]
138 } 137 }
139 } 138 }
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