| OLD | NEW |
| 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("//remoting/remoting_enable.gni") | 6 import("//remoting/remoting_enable.gni") |
| 7 import("//remoting/remoting_locales.gni") | 7 import("//remoting/remoting_locales.gni") |
| 8 import("//remoting/remoting_version.gni") | 8 import("//remoting/remoting_version.gni") |
| 9 | 9 |
| 10 if (is_win) { | 10 if (is_win) { |
| (...skipping 48 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 59 ] | 59 ] |
| 60 | 60 |
| 61 if (is_desktop_linux) { | 61 if (is_desktop_linux) { |
| 62 # GTK2 pulls pangoft2 as dependency, and pangoft2 depends on harfbuzz. | 62 # GTK2 pulls pangoft2 as dependency, and pangoft2 depends on harfbuzz. |
| 63 # To avoid missing indirectly referenced harfbuzz symbols from pango, | 63 # To avoid missing indirectly referenced harfbuzz symbols from pango, |
| 64 # some hack is required when bundled harfbuzz is used and component build is | 64 # some hack is required when bundled harfbuzz is used and component build is |
| 65 # disabled. | 65 # disabled. |
| 66 # See crbug.com/462689 for details. | 66 # See crbug.com/462689 for details. |
| 67 all_dependent_configs = [ "//third_party/harfbuzz-ng:pangoft2_link_hack" ] | 67 all_dependent_configs = [ "//third_party/harfbuzz-ng:pangoft2_link_hack" ] |
| 68 | 68 |
| 69 deps += [ "//build/config/linux/gtk2" ] | 69 if (use_gtk3) { |
| 70 deps += [ "//build/config/linux/gtk3" ] |
| 71 } else { |
| 72 deps += [ "//build/config/linux/gtk2" ] |
| 73 } |
| 70 } | 74 } |
| 71 } | 75 } |
| 72 | 76 |
| 73 if (!is_chromeos && !is_android && enable_remoting_host) { | 77 if (!is_chromeos && !is_android && enable_remoting_host) { |
| 74 if (is_win) { | 78 if (is_win) { |
| 75 # GYP version: | 79 # GYP version: |
| 76 # //remoting/remoting_host_win.gypi:remoting_it2me_native_messaging_host | 80 # //remoting/remoting_host_win.gypi:remoting_it2me_native_messaging_host |
| 77 executable("remote_assistance_host") { | 81 executable("remote_assistance_host") { |
| 78 configs += [ "//build/config/compiler:wexit_time_destructors" ] | 82 configs += [ "//build/config/compiler:wexit_time_destructors" ] |
| 79 | 83 |
| (...skipping 143 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 223 if (icu_use_data_file) { | 227 if (icu_use_data_file) { |
| 224 deps += [ ":remote_assistance_host_resources" ] | 228 deps += [ ":remote_assistance_host_resources" ] |
| 225 } | 229 } |
| 226 } | 230 } |
| 227 | 231 |
| 228 if (enable_webrtc) { | 232 if (enable_webrtc) { |
| 229 deps += [ "//third_party/libjingle:libjingle_webrtc" ] | 233 deps += [ "//third_party/libjingle:libjingle_webrtc" ] |
| 230 } | 234 } |
| 231 | 235 |
| 232 if (is_desktop_linux) { | 236 if (is_desktop_linux) { |
| 233 deps += [ "//build/config/linux/gtk2" ] | 237 if (use_gtk3) { |
| 238 deps += [ "//build/config/linux/gtk3" ] |
| 239 } else { |
| 240 deps += [ "//build/config/linux/gtk2" ] |
| 241 } |
| 234 } | 242 } |
| 235 } | 243 } |
| 236 } | 244 } |
| 237 } | 245 } |
| OLD | NEW |