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

Side by Side Diff: content/test/BUILD.gn

Issue 912633003: libjingle build fixes to enable_webrtc in the Linux GN build. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: gn format Created 5 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 | « build/config/features.gni ('k') | third_party/libjingle/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("//build/config/crypto.gni") 5 import("//build/config/crypto.gni")
6 import("//build/config/features.gni") 6 import("//build/config/features.gni")
7 import("//build/config/ui.gni") 7 import("//build/config/ui.gni")
8 import("//build/module_args/v8.gni") 8 import("//build/module_args/v8.gni")
9 import("//testing/test.gni") 9 import("//testing/test.gni")
10 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni") 10 import("//third_party/mojo/src/mojo/public/tools/bindings/mojom.gni")
(...skipping 64 matching lines...) Expand 10 before | Expand all | Expand 10 after
75 "//ui/surface", 75 "//ui/surface",
76 "//v8", 76 "//v8",
77 "//webkit/common/gpu", 77 "//webkit/common/gpu",
78 ] 78 ]
79 79
80 if (enable_plugins) { 80 if (enable_plugins) {
81 deps += [ "//content/ppapi_plugin" ] 81 deps += [ "//content/ppapi_plugin" ]
82 } 82 }
83 83
84 if (enable_webrtc) { 84 if (enable_webrtc) {
85 # TODO(GYP) remove this when libjingle is converted.
86 configs += [ "//third_party/libjingle:jingle_direct_dependent_configs" ]
87
88 sources += [ 85 sources += [
89 "../renderer/media/mock_media_stream_dispatcher.cc", 86 "../renderer/media/mock_media_stream_dispatcher.cc",
90 "../renderer/media/mock_media_stream_dispatcher.h", 87 "../renderer/media/mock_media_stream_dispatcher.h",
88 "../renderer/media/mock_data_channel_impl.cc",
89 "../renderer/media/mock_data_channel_impl.h",
91 "../renderer/media/mock_peer_connection_impl.cc", 90 "../renderer/media/mock_peer_connection_impl.cc",
92 "../renderer/media/mock_peer_connection_impl.h", 91 "../renderer/media/mock_peer_connection_impl.h",
93 "../renderer/media/mock_web_rtc_peer_connection_handler_client.cc", 92 "../renderer/media/mock_web_rtc_peer_connection_handler_client.cc",
94 "../renderer/media/mock_web_rtc_peer_connection_handler_client.h", 93 "../renderer/media/mock_web_rtc_peer_connection_handler_client.h",
95 "../renderer/media/webrtc/mock_peer_connection_dependency_factory.cc", 94 "../renderer/media/webrtc/mock_peer_connection_dependency_factory.cc",
96 "../renderer/media/webrtc/mock_peer_connection_dependency_factory.h", 95 "../renderer/media/webrtc/mock_peer_connection_dependency_factory.h",
97 ] 96 ]
98 97
99 deps += [ 98 deps += [
100 #"//third_party/libjingle:webrtc", TODO(GYP) 99 "//third_party/libjingle:libjingle_webrtc",
101 #"//third_party/libjingle:peerconnection", TODO(GYP) 100 "//third_party/libjingle:libpeerconnection",
102 "//third_party/webrtc/modules/video_capture", 101 "//third_party/webrtc/modules/video_capture",
103 ] 102 ]
104 } 103 }
105 if (!enable_plugins) { 104 if (!enable_plugins) {
106 sources -= [ "ppapi_unittest.cc" ] 105 sources -= [ "ppapi_unittest.cc" ]
107 } 106 }
108 107
109 if (use_glib) { 108 if (use_glib) {
110 configs += [ "//build/config/linux:glib" ] 109 configs += [ "//build/config/linux:glib" ]
111 } 110 }
(...skipping 409 matching lines...) Expand 10 before | Expand all | Expand 10 after
521 "//third_party/webrtc/modules/video_capture", 520 "//third_party/webrtc/modules/video_capture",
522 ] 521 ]
523 522
524 if (is_linux || is_mac || is_win) { 523 if (is_linux || is_mac || is_win) {
525 sources += 524 sources +=
526 [ "../browser/media/capture/desktop_capture_device_unittest.cc" ] 525 [ "../browser/media/capture/desktop_capture_device_unittest.cc" ]
527 deps += [ "//third_party/webrtc/modules/desktop_capture" ] 526 deps += [ "//third_party/webrtc/modules/desktop_capture" ]
528 } 527 }
529 528
530 if (is_chromeos) { 529 if (is_chromeos) {
531 sources += 530 sources += [ "../browser/media/capture/desktop_capture_device_aura_unitt est.cc" ]
532 [ "browser/media/capture/desktop_capture_device_aura_unittest.cc" ]
533 } 531 }
534 } else { 532 } else {
535 if (enable_plugins) { 533 if (enable_plugins) {
536 # This file is added only when plugins are enabled, but we don't want it 534 # This file is added only when plugins are enabled, but we don't want it
537 # unless webrtc is also enabled. 535 # unless webrtc is also enabled.
538 sources -= 536 sources -=
539 [ "../renderer/media/webrtc/video_destination_handler_unittest.cc" ] 537 [ "../renderer/media/webrtc/video_destination_handler_unittest.cc" ]
540 } 538 }
541 } 539 }
542 540
(...skipping 155 matching lines...) Expand 10 before | Expand all | Expand 10 after
698 "//content/public/common", 696 "//content/public/common",
699 "//testing/gtest", 697 "//testing/gtest",
700 "//third_party/WebKit/public:blink", 698 "//third_party/WebKit/public:blink",
701 "//ui/base", 699 "//ui/base",
702 "//ui/gfx", 700 "//ui/gfx",
703 "//ui/gfx/geometry", 701 "//ui/gfx/geometry",
704 "//ui/gl", 702 "//ui/gl",
705 ] 703 ]
706 } 704 }
707 } 705 }
OLDNEW
« no previous file with comments | « build/config/features.gni ('k') | third_party/libjingle/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698