Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2015 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2015 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/linux/pkg_config.gni") | 6 import("//build/config/linux/pkg_config.gni") |
| 7 import("//tools/generate_library_loader/generate_library_loader.gni") | 7 import("//tools/generate_library_loader/generate_library_loader.gni") |
| 8 | 8 |
| 9 gypi_values = exec_script("//build/gypi_to_gn.py", | 9 gypi_values = exec_script("//build/gypi_to_gn.py", |
| 10 [ rebase_path("system.gyp") ], | 10 [ rebase_path("system.gyp") ], |
| 11 "scope", | 11 "scope", |
| 12 [ "system.gyp" ]) | 12 [ "system.gyp" ]) |
| 13 | 13 |
| 14 use_system_fontconfig = !is_chromecast | 14 use_system_fontconfig = !is_chromecast |
|
slan
2016/01/25 17:35:16
Could you add a comment above these two vars expla
bcf
2016/01/25 19:51:33
Done.
In addition, I just changed freetype2 to ch
slan
2016/01/27 23:57:06
Though I understand that directly checking for Chr
| |
| 15 use_system_freetype = !is_chromecast | |
| 15 | 16 |
| 16 # If brlapi isn't needed, don't require it to be installed. | 17 # If brlapi isn't needed, don't require it to be installed. |
| 17 if (use_brlapi) { | 18 if (use_brlapi) { |
| 18 config("brlapi_config") { | 19 config("brlapi_config") { |
| 19 defines = [ "USE_BRLAPI" ] | 20 defines = [ "USE_BRLAPI" ] |
| 20 } | 21 } |
| 21 | 22 |
| 22 # TODO(GYP) linux_link_brlapi support. Is this needed? | 23 # TODO(GYP) linux_link_brlapi support. Is this needed? |
| 23 generate_library_loader("libbrlapi") { | 24 generate_library_loader("libbrlapi") { |
| 24 name = "LibBrlapiLoader" | 25 name = "LibBrlapiLoader" |
| (...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 108 | 109 |
| 109 group("fontconfig") { | 110 group("fontconfig") { |
| 110 if (use_system_fontconfig) { | 111 if (use_system_fontconfig) { |
| 111 public_configs = [ "//build/config/linux:fontconfig" ] | 112 public_configs = [ "//build/config/linux:fontconfig" ] |
| 112 } else { | 113 } else { |
| 113 public_deps = [ | 114 public_deps = [ |
| 114 "//third_party/fontconfig", | 115 "//third_party/fontconfig", |
| 115 ] | 116 ] |
| 116 } | 117 } |
| 117 } | 118 } |
| 119 | |
| 120 group("freetype2") { | |
| 121 if (use_system_freetype) { | |
| 122 public_configs = [ "//build/config/linux:freetype2" ] | |
| 123 } else { | |
| 124 public_deps = [ | |
| 125 "//third_party/freetype2", | |
|
slan
2016/01/25 17:35:16
This should be freetype-android target.
Also, the
bcf
2016/01/25 19:51:33
I haven't update GN yet in PS1. Its done now thoug
| |
| 126 ] | |
| 127 } | |
| 128 } | |
| OLD | NEW |