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

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

Issue 1627533002: [Chromecast] Depend on Chromium's freetype-android (Closed) Base URL: https://chromium.googlesource.com/chromium/src@master
Patch Set: Add clarification of using freetype-android Created 4 years, 11 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 | « content/content_shell.gypi ('k') | skia/BUILD.gn » ('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 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/sanitizers/sanitizers.gni") 6 import("//build/config/sanitizers/sanitizers.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//build/config/win/manifest.gni") 8 import("//build/config/win/manifest.gni")
9 import("//tools/grit/repack.gni") 9 import("//tools/grit/repack.gni")
10 import("//tools/grit/grit_rule.gni") 10 import("//tools/grit/grit_rule.gni")
(...skipping 295 matching lines...) Expand 10 before | Expand all | Expand 10 after
306 #deps -= [ 'copy_test_netscape_plugin' ] TODO(GYP) 306 #deps -= [ 'copy_test_netscape_plugin' ] TODO(GYP)
307 } 307 }
308 308
309 if (is_chromeos) { 309 if (is_chromeos) {
310 deps += [ 310 deps += [
311 "//chromeos", 311 "//chromeos",
312 "//ui/wm:test_support", 312 "//ui/wm:test_support",
313 ] 313 ]
314 } 314 }
315 315
316 if (is_linux && !is_chromecast) { 316 if (is_linux) {
317 deps += [ "//third_party/freetype2" ] 317 deps += [ "//third_party/freetype2" ]
Dirk Pranke 2016/01/28 01:09:21 is this right? you'll get //third_party/freetype2
bcf 2016/01/28 21:37:28 This logic is from this CL: https://codereview.chr
Nico 2016/01/28 21:55:47 This looks wrong to me too -- you probably don't w
bcf 2016/01/28 22:31:04 We discussed in the predecessor of this CL that th
Nico 2016/01/28 22:33:01 Does android use freetype2 for tests and freetype-
318 } 318 }
319 319
320 if (!enable_plugins) { 320 if (!enable_plugins) {
321 sources -= [ 321 sources -= [
322 "browser/shell_plugin_service_filter.cc", 322 "browser/shell_plugin_service_filter.cc",
323 "browser/shell_plugin_service_filter.h", 323 "browser/shell_plugin_service_filter.h",
324 ] 324 ]
325 } 325 }
326 } 326 }
327 327
(...skipping 157 matching lines...) Expand 10 before | Expand all | Expand 10 after
485 sources = [ 485 sources = [
486 "app/shell_content_main.cc", 486 "app/shell_content_main.cc",
487 "app/shell_content_main.h", 487 "app/shell_content_main.h",
488 ] 488 ]
489 489
490 deps = [ 490 deps = [
491 ":content_shell_lib", 491 ":content_shell_lib",
492 ] 492 ]
493 } 493 }
494 } 494 }
OLDNEW
« no previous file with comments | « content/content_shell.gypi ('k') | skia/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698