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

Side by Side Diff: webrtc/modules/desktop_capture/BUILD.gn

Issue 2684683003: Check for use_x11 before runnig desktop_capture_modules_tests on linux. (Closed)
Patch Set: Check for use_x11 only on linux. 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 | « no previous file | 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/ui.gni") 9 import("//build/config/ui.gni")
10 import("../../webrtc.gni") 10 import("../../webrtc.gni")
(...skipping 19 matching lines...) Expand all
30 "../..:webrtc_common", 30 "../..:webrtc_common",
31 "../../base:rtc_base", # TODO(kjellander): Cleanup in bugs.webrtc.org/3806. 31 "../../base:rtc_base", # TODO(kjellander): Cleanup in bugs.webrtc.org/3806.
32 ] 32 ]
33 } 33 }
34 34
35 if (rtc_include_tests) { 35 if (rtc_include_tests) {
36 rtc_source_set("desktop_capture_modules_tests") { 36 rtc_source_set("desktop_capture_modules_tests") {
37 testonly = true 37 testonly = true
38 sources = [] 38 sources = []
39 deps = [] 39 deps = []
40 if (rtc_desktop_capture_supported) { 40 if ((!is_linux || use_x11) && rtc_desktop_capture_supported) {
kjellander_webrtc 2017/02/09 13:59:50 This is somewhat hard to read. What about to chang
Sergey Ulanov 2017/02/09 18:52:22 There is an issue with Chrome OS and Android. Ther
41 deps += [ 41 deps += [
42 ":desktop_capture",
42 ":desktop_capture_mock", 43 ":desktop_capture_mock",
43 ":primitives", 44 ":primitives",
44 ":screen_drawer", 45 ":screen_drawer",
45 "../../base:rtc_base", 46 "../../base:rtc_base",
46 "../../base:rtc_base_approved", 47 "../../base:rtc_base_approved",
47 "../../system_wrappers:system_wrappers", 48 "../../system_wrappers:system_wrappers",
48 "../../test:test_support", 49 "../../test:test_support",
49 "../../test:video_test_support", 50 "../../test:video_test_support",
50 ] 51 ]
51 sources += [ 52 sources += [
(...skipping 249 matching lines...) Expand 10 before | Expand all | Expand 10 after
301 sources = [ 302 sources = [
302 "differ_vector_sse2.cc", 303 "differ_vector_sse2.cc",
303 "differ_vector_sse2.h", 304 "differ_vector_sse2.h",
304 ] 305 ]
305 306
306 if (is_posix) { 307 if (is_posix) {
307 cflags = [ "-msse2" ] 308 cflags = [ "-msse2" ]
308 } 309 }
309 } 310 }
310 } 311 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698