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

Side by Side Diff: webrtc/webrtc.gni

Issue 2684683003: Check for use_x11 before runnig desktop_capture_modules_tests on linux. (Closed)
Patch Set: Addressed comments. Created 3 years, 10 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 | « webrtc/modules/desktop_capture/BUILD.gn ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
2 # 2 #
3 # Use of this source code is governed by a BSD-style license 3 # Use of this source code is governed by a BSD-style license
4 # that can be found in the LICENSE file in the root of the source 4 # that can be found in the LICENSE file in the root of the source
5 # tree. An additional intellectual property rights grant can be found 5 # tree. An additional intellectual property rights grant can be found
6 # in the file PATENTS. All contributing project authors may 6 # in the file PATENTS. All contributing project authors may
7 # be found in the AUTHORS file in the root of the source tree. 7 # be found in the AUTHORS file in the root of the source tree.
8 8
9 import("//build/config/arm.gni") 9 import("//build/config/arm.gni")
10 import("//build/config/features.gni") 10 import("//build/config/features.gni")
11 import("//build/config/mips.gni") 11 import("//build/config/mips.gni")
12 import("//build/config/sanitizers/sanitizers.gni") 12 import("//build/config/sanitizers/sanitizers.gni")
13 import("//build/config/ui.gni")
13 import("//build_overrides/build.gni") 14 import("//build_overrides/build.gni")
14 import("//testing/test.gni") 15 import("//testing/test.gni")
15 16
16 declare_args() { 17 declare_args() {
17 # Disable this to avoid building the Opus audio codec. 18 # Disable this to avoid building the Opus audio codec.
18 rtc_include_opus = true 19 rtc_include_opus = true
19 20
20 # Enable this if the Opus version upon which WebRTC is built supports direct 21 # Enable this if the Opus version upon which WebRTC is built supports direct
21 # encoding of 120 ms packets. 22 # encoding of 120 ms packets.
22 rtc_opus_support_120ms_ptime = false 23 rtc_opus_support_120ms_ptime = false
(...skipping 142 matching lines...) Expand 10 before | Expand all | Expand 10 after
165 rtc_include_tests = !build_with_chromium 166 rtc_include_tests = !build_with_chromium
166 } 167 }
167 168
168 # Make it possible to provide custom locations for some libraries (move these 169 # Make it possible to provide custom locations for some libraries (move these
169 # up into declare_args should we need to actually use them for the GN build). 170 # up into declare_args should we need to actually use them for the GN build).
170 rtc_libvpx_dir = "//third_party/libvpx" 171 rtc_libvpx_dir = "//third_party/libvpx"
171 rtc_libyuv_dir = "//third_party/libyuv" 172 rtc_libyuv_dir = "//third_party/libyuv"
172 rtc_opus_dir = "//third_party/opus" 173 rtc_opus_dir = "//third_party/opus"
173 174
174 # Desktop capturer is supported only on Windows, OSX and Linux. 175 # Desktop capturer is supported only on Windows, OSX and Linux.
175 rtc_desktop_capture_supported = is_win || is_mac || is_linux 176 rtc_desktop_capture_supported = is_win || is_mac || (is_linux && use_x11)
176 177
177 ############################################################################### 178 ###############################################################################
178 # Templates 179 # Templates
179 # 180 #
180 181
181 # Points to //webrtc/ in webrtc stand-alone or to //third_party/webrtc/ in 182 # Points to //webrtc/ in webrtc stand-alone or to //third_party/webrtc/ in
182 # chromium. 183 # chromium.
183 # We need absolute paths for all configs in templates as they are shared in 184 # We need absolute paths for all configs in templates as they are shared in
184 # different subdirectories. 185 # different subdirectories.
185 webrtc_root = get_path_info(".", "abspath") 186 webrtc_root = get_path_info(".", "abspath")
(...skipping 134 matching lines...) Expand 10 before | Expand all | Expand 10 after
320 ]) 321 ])
321 configs += invoker.configs 322 configs += invoker.configs
322 configs -= rtc_remove_configs 323 configs -= rtc_remove_configs
323 configs -= invoker.suppressed_configs 324 configs -= invoker.suppressed_configs
324 public_configs = [ rtc_common_inherited_config ] 325 public_configs = [ rtc_common_inherited_config ]
325 if (defined(invoker.public_configs)) { 326 if (defined(invoker.public_configs)) {
326 public_configs += invoker.public_configs 327 public_configs += invoker.public_configs
327 } 328 }
328 } 329 }
329 } 330 }
OLDNEW
« no previous file with comments | « webrtc/modules/desktop_capture/BUILD.gn ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698