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

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

Issue 2514413002: Clean up GTK3 build flags. (Closed)
Patch Set: Fixes Created 4 years 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/util/process_version.gni") 5 import("//build/util/process_version.gni")
6 import("//remoting/build/config/remoting_build.gni") 6 import("//remoting/build/config/remoting_build.gni")
7 7
8 group("all_tests") { 8 group("all_tests") {
9 testonly = true 9 testonly = true
10 10
(...skipping 320 matching lines...) Expand 10 before | Expand all | Expand 10 after
331 if (is_linux && !is_chromeos) { 331 if (is_linux && !is_chromeos) {
332 libs += [ "pam" ] 332 libs += [ "pam" ]
333 } 333 }
334 334
335 if (use_x11) { 335 if (use_x11) {
336 configs += [ 336 configs += [
337 "//build/config/linux:x11", 337 "//build/config/linux:x11",
338 "//build/config/linux:xrandr", 338 "//build/config/linux:xrandr",
339 ] 339 ]
340 if (is_desktop_linux) { 340 if (is_desktop_linux) {
341 if (use_gtk3) { 341 deps += [ "//build/config/linux/gtk" ]
342 deps += [ "//build/config/linux/gtk3" ]
343 } else {
344 deps += [ "//build/config/linux/gtk2" ]
345 }
346 } 342 }
347 } else { 343 } else {
348 sources -= [ 344 sources -= [
349 "clipboard_x11.cc", 345 "clipboard_x11.cc",
350 "desktop_resizer_x11.cc", 346 "desktop_resizer_x11.cc",
351 "input_injector_x11.cc", 347 "input_injector_x11.cc",
352 "local_input_monitor_x11.cc", 348 "local_input_monitor_x11.cc",
353 ] 349 ]
354 if (is_linux) { 350 if (is_linux) {
355 # These will already be filtered out on non-Linux. 351 # These will already be filtered out on non-Linux.
(...skipping 389 matching lines...) Expand 10 before | Expand all | Expand 10 after
745 741
746 if (enable_webrtc) { 742 if (enable_webrtc) {
747 deps += [ 743 deps += [
748 "//third_party/libjingle/webrtc:libjingle_webrtc", 744 "//third_party/libjingle/webrtc:libjingle_webrtc",
749 "//third_party/webrtc/libjingle/xmllite", 745 "//third_party/webrtc/libjingle/xmllite",
750 "//third_party/webrtc/libjingle/xmpp", 746 "//third_party/webrtc/libjingle/xmpp",
751 ] 747 ]
752 } 748 }
753 749
754 if (is_desktop_linux) { 750 if (is_desktop_linux) {
755 if (use_gtk3) { 751 deps += [ "//build/config/linux/gtk" ]
756 deps += [ "//build/config/linux/gtk3" ]
757 } else {
758 deps += [ "//build/config/linux/gtk2" ]
759 }
760 } 752 }
761 if ((is_linux && !is_chromeos) || is_mac) { 753 if ((is_linux && !is_chromeos) || is_mac) {
762 libs = [ "pam" ] 754 libs = [ "pam" ]
763 } 755 }
764 756
765 if (is_mac && is_official_build) { 757 if (is_mac && is_official_build) {
766 sources += [ "internal/internal_mac-inl.h" ] 758 sources += [ "internal/internal_mac-inl.h" ]
767 } 759 }
768 760
769 if (remoting_multi_process != 0) { 761 if (remoting_multi_process != 0) {
(...skipping 74 matching lines...) Expand 10 before | Expand all | Expand 10 after
844 group("remoting_me2me_host_archive") { 836 group("remoting_me2me_host_archive") {
845 deps = [ 837 deps = [
846 "//remoting/host/installer/mac:remoting_me2me_host_archive", 838 "//remoting/host/installer/mac:remoting_me2me_host_archive",
847 ] 839 ]
848 } 840 }
849 } else { 841 } else {
850 group("remoting_me2me_host_archive") { 842 group("remoting_me2me_host_archive") {
851 } 843 }
852 } 844 }
853 } 845 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698