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

Side by Side Diff: content/common/BUILD.gn

Issue 2278143002: Filter font list, use Fontconfig and build on Ozone (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Review comments by derat@ addressed, trying to fix mac and Android builds Created 4 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
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/features.gni") 5 import("//build/config/features.gni")
6 import("//build/config/ui.gni") 6 import("//build/config/ui.gni")
7 import("//content/common/common.gni") 7 import("//content/common/common.gni")
8 import("//media/media_options.gni") 8 import("//media/media_options.gni")
9 import("//mojo/public/tools/bindings/mojom.gni") 9 import("//mojo/public/tools/bindings/mojom.gni")
10 import("//tools/ipc_fuzzer/ipc_fuzzer.gni") 10 import("//tools/ipc_fuzzer/ipc_fuzzer.gni")
(...skipping 125 matching lines...) Expand 10 before | Expand all | Expand 10 after
136 if (is_debug && !is_component_build && enable_plugins) { 136 if (is_debug && !is_component_build && enable_plugins) {
137 # Content depends on the PPAPI message logging stuff; if this isn't here, 137 # Content depends on the PPAPI message logging stuff; if this isn't here,
138 # some unit test binaries won't compile. This only worked in release mode 138 # some unit test binaries won't compile. This only worked in release mode
139 # because logging is disabled there. 139 # because logging is disabled there.
140 deps += [ "//ppapi/proxy:ipc_sources" ] 140 deps += [ "//ppapi/proxy:ipc_sources" ]
141 } 141 }
142 142
143 if (use_ozone) { 143 if (use_ozone) {
144 deps += [ "//ui/ozone" ] 144 deps += [ "//ui/ozone" ]
145 } else { 145 } else {
146 sources -= [ 146 sources -= [ "cursors/webcursor_ozone.cc" ]
147 "cursors/webcursor_ozone.cc",
148 "font_list_ozone.cc",
149 ]
150 } 147 }
151 148
152 if (!use_aura || is_android) { 149 if (!use_aura || is_android) {
153 sources -= [ "cursors/webcursor_aura.cc" ] 150 sources -= [ "cursors/webcursor_aura.cc" ]
154 } 151 }
155 152
156 if (!use_aura || !use_x11) { 153 if (!use_aura || !use_x11) {
157 sources -= [ "cursors/webcursor_aurax11.cc" ] 154 sources -= [ "cursors/webcursor_aurax11.cc" ]
158 } 155 }
159 156
160 if (use_pango) { 157 if (is_linux) {
rjkroege 2016/08/25 19:17:16 I think you've conflated use_ozone and is_linux. T
161 configs += [ "//build/config/linux/pangocairo" ] 158 deps += [ "//build/linux:fontconfig" ]
162 if (use_ozone) { 159 }
163 # If we're using pango, never use this ozone file (it was removed in all 160
164 # non-ozone cases above). 161 if (is_mac || is_win || is_android) {
165 sources -= [ "font_list_ozone.cc" ] 162 sources -= [ "font_list_fontconfig.cc" ]
166 }
167 } else {
168 sources -= [ "font_list_pango.cc" ]
169 } 163 }
170 164
171 if (enable_plugins) { 165 if (enable_plugins) {
172 deps += [ 166 deps += [
173 "//ppapi/proxy", 167 "//ppapi/proxy",
174 "//ppapi/shared_impl", 168 "//ppapi/shared_impl",
175 ] 169 ]
176 } else { 170 } else {
177 sources -= [ 171 sources -= [
178 "pepper_file_util.cc", 172 "pepper_file_util.cc",
(...skipping 89 matching lines...) Expand 10 before | Expand all | Expand 10 after
268 "//third_party/WebKit/public:mojo_bindings", 262 "//third_party/WebKit/public:mojo_bindings",
269 "//ui/gfx/geometry/mojo", 263 "//ui/gfx/geometry/mojo",
270 "//url/mojo:url_mojom_gurl", 264 "//url/mojo:url_mojom_gurl",
271 "//url/mojo:url_mojom_origin", 265 "//url/mojo:url_mojom_origin",
272 ] 266 ]
273 267
274 export_class_attribute = "CONTENT_EXPORT" 268 export_class_attribute = "CONTENT_EXPORT"
275 export_define = "CONTENT_IMPLEMENTATION=1" 269 export_define = "CONTENT_IMPLEMENTATION=1"
276 export_header = "content/common/content_export.h" 270 export_header = "content/common/content_export.h"
277 } 271 }
OLDNEW
« no previous file with comments | « no previous file | content/common/font_list_fontconfig.cc » ('j') | content/common/font_list_fontconfig.cc » ('J')

Powered by Google App Engine
This is Rietveld 408576698