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

Side by Side Diff: remoting/host/BUILD.gn

Issue 2342163002: Fix gtk3 build (Closed)
Patch Set: wip 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
« no previous file with comments | « chrome/test/BUILD.gn ('k') | remoting/host/it2me/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("//remoting/build/config/remoting_build.gni") 5 import("//remoting/build/config/remoting_build.gni")
6 6
7 process_version("remoting_version") { 7 process_version("remoting_version") {
8 template_file = "//remoting/host/version.h.in" 8 template_file = "//remoting/host/version.h.in"
9 sources = [ 9 sources = [
10 branding_path, 10 branding_path,
(...skipping 393 matching lines...) Expand 10 before | Expand all | Expand 10 after
404 if (is_linux && !is_chromeos) { 404 if (is_linux && !is_chromeos) {
405 libs += [ "pam" ] 405 libs += [ "pam" ]
406 } 406 }
407 407
408 if (use_x11) { 408 if (use_x11) {
409 configs += [ 409 configs += [
410 "//build/config/linux:x11", 410 "//build/config/linux:x11",
411 "//build/config/linux:xrandr", 411 "//build/config/linux:xrandr",
412 ] 412 ]
413 if (is_desktop_linux) { 413 if (is_desktop_linux) {
414 deps += [ "//build/config/linux/gtk2" ] 414 if (use_gtk3) {
415 deps += [ "//build/config/linux/gtk3" ]
416 } else {
417 deps += [ "//build/config/linux/gtk2" ]
418 }
415 } 419 }
416 } else { 420 } else {
417 sources -= [ 421 sources -= [
418 "clipboard_x11.cc", 422 "clipboard_x11.cc",
419 "desktop_resizer_x11.cc", 423 "desktop_resizer_x11.cc",
420 "input_injector_x11.cc", 424 "input_injector_x11.cc",
421 "local_input_monitor_x11.cc", 425 "local_input_monitor_x11.cc",
422 ] 426 ]
423 if (is_linux) { 427 if (is_linux) {
424 # These will already be filtered out on non-Linux. 428 # These will already be filtered out on non-Linux.
(...skipping 722 matching lines...) Expand 10 before | Expand all | Expand 10 after
1147 1151
1148 if (enable_webrtc) { 1152 if (enable_webrtc) {
1149 deps += [ 1153 deps += [
1150 "//third_party/libjingle:libjingle_webrtc", 1154 "//third_party/libjingle:libjingle_webrtc",
1151 "//third_party/webrtc/libjingle/xmllite", 1155 "//third_party/webrtc/libjingle/xmllite",
1152 "//third_party/webrtc/libjingle/xmpp", 1156 "//third_party/webrtc/libjingle/xmpp",
1153 ] 1157 ]
1154 } 1158 }
1155 1159
1156 if (is_desktop_linux) { 1160 if (is_desktop_linux) {
1157 deps += [ "//build/config/linux/gtk2" ] 1161 if (use_gtk3) {
1162 deps += [ "//build/config/linux/gtk3" ]
1163 } else {
1164 deps += [ "//build/config/linux/gtk2" ]
1165 }
1158 } 1166 }
1159 if ((is_linux && !is_chromeos) || is_mac) { 1167 if ((is_linux && !is_chromeos) || is_mac) {
1160 libs = [ "pam" ] 1168 libs = [ "pam" ]
1161 } 1169 }
1162 1170
1163 if (is_mac && is_official_build) { 1171 if (is_mac && is_official_build) {
1164 sources += [ "internal/internal_mac-inl.h" ] 1172 sources += [ "internal/internal_mac-inl.h" ]
1165 defines += [ "USE_REMOTING_MACOSX_INTERNAL" ] 1173 defines += [ "USE_REMOTING_MACOSX_INTERNAL" ]
1166 } 1174 }
1167 1175
(...skipping 733 matching lines...) Expand 10 before | Expand all | Expand 10 after
1901 root_build_dir), 1909 root_build_dir),
1902 rebase_path(outputs[0], root_build_dir), 1910 rebase_path(outputs[0], root_build_dir),
1903 ] 1911 ]
1904 } 1912 }
1905 } else { 1913 } else {
1906 group("remoting_host_installation") { 1914 group("remoting_host_installation") {
1907 } 1915 }
1908 } 1916 }
1909 } 1917 }
1910 } 1918 }
OLDNEW
« no previous file with comments | « chrome/test/BUILD.gn ('k') | remoting/host/it2me/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698