Chromium Code Reviews| OLD | NEW |
|---|---|
| 1 # Copyright (c) 2016 The WebRTC project authors. All Rights Reserved. | 1 # Copyright (c) 2016 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/linux/pkg_config.gni") | 9 import("//build/config/linux/pkg_config.gni") |
| 10 import("../build/webrtc.gni") | 10 import("../build/webrtc.gni") |
| (...skipping 14 matching lines...) Expand all Loading... | |
| 25 | 25 |
| 26 config("rtc_media_warnings_config") { | 26 config("rtc_media_warnings_config") { |
| 27 # GN orders flags on a target before flags from configs. The default config | 27 # GN orders flags on a target before flags from configs. The default config |
| 28 # adds these flags so to cancel them out they need to come from a config and | 28 # adds these flags so to cancel them out they need to come from a config and |
| 29 # cannot be on the target directly. | 29 # cannot be on the target directly. |
| 30 if (!is_win) { | 30 if (!is_win) { |
| 31 cflags = [ "-Wno-deprecated-declarations" ] | 31 cflags = [ "-Wno-deprecated-declarations" ] |
| 32 } | 32 } |
| 33 } | 33 } |
| 34 | 34 |
| 35 if (is_linux && rtc_use_gtk) { | 35 if (is_linux && rtc_use_gtk) { |
|
Tom (Use chromium acct)
2017/01/20 23:13:13
Please also remove this to fix the bug
pbos-webrtc
2017/01/20 23:16:02
Done.
| |
| 36 pkg_config("gtk-lib") { | 36 pkg_config("gtk-lib") { |
| 37 packages = [ | 37 packages = [ |
| 38 "gobject-2.0", | 38 "gobject-2.0", |
| 39 "gthread-2.0", | 39 "gthread-2.0", |
| 40 "gtk+-2.0", | 40 "gtk+-2.0", |
| 41 ] | 41 ] |
| 42 } | 42 } |
| 43 } | 43 } |
| 44 | 44 |
| 45 rtc_static_library("rtc_media_base") { | 45 rtc_static_library("rtc_media_base") { |
| (...skipping 145 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 191 deps += [ "//third_party/usrsctp" ] | 191 deps += [ "//third_party/usrsctp" ] |
| 192 } | 192 } |
| 193 | 193 |
| 194 public_configs = [] | 194 public_configs = [] |
| 195 if (build_with_chromium) { | 195 if (build_with_chromium) { |
| 196 deps += [ "../modules/video_capture:video_capture" ] | 196 deps += [ "../modules/video_capture:video_capture" ] |
| 197 } else { | 197 } else { |
| 198 public_configs += [ ":rtc_media_defines_config" ] | 198 public_configs += [ ":rtc_media_defines_config" ] |
| 199 deps += [ "../modules/video_capture:video_capture_internal_impl" ] | 199 deps += [ "../modules/video_capture:video_capture_internal_impl" ] |
| 200 } | 200 } |
| 201 if (is_linux && rtc_use_gtk) { | |
| 202 sources += [ | |
| 203 "devices/gtkvideorenderer.cc", | |
| 204 "devices/gtkvideorenderer.h", | |
| 205 ] | |
| 206 public_configs += [ ":gtk-lib" ] | |
| 207 } | |
| 208 deps += [ | 201 deps += [ |
| 209 ":rtc_media_base", | 202 ":rtc_media_base", |
| 210 "..:webrtc_common", | 203 "..:webrtc_common", |
| 211 "../api:call_api", | 204 "../api:call_api", |
| 212 "../api:transport_api", | 205 "../api:transport_api", |
| 213 "../base:rtc_base_approved", | 206 "../base:rtc_base_approved", |
| 214 "../call", | 207 "../call", |
| 215 "../modules/audio_mixer:audio_mixer_impl", | 208 "../modules/audio_mixer:audio_mixer_impl", |
| 216 "../modules/video_coding", | 209 "../modules/video_coding", |
| 217 "../system_wrappers", | 210 "../system_wrappers", |
| (...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
| 384 # TODO(kjellander): Move as part of work in bugs.webrtc.org/4243. | 377 # TODO(kjellander): Move as part of work in bugs.webrtc.org/4243. |
| 385 ":rtc_media", | 378 ":rtc_media", |
| 386 ":rtc_unittest_main", | 379 ":rtc_unittest_main", |
| 387 "../audio", | 380 "../audio", |
| 388 "../base:rtc_base_tests_utils", | 381 "../base:rtc_base_tests_utils", |
| 389 "../modules/audio_device:mock_audio_device", | 382 "../modules/audio_device:mock_audio_device", |
| 390 "../system_wrappers:metrics_default", | 383 "../system_wrappers:metrics_default", |
| 391 ] | 384 ] |
| 392 } | 385 } |
| 393 } | 386 } |
| OLD | NEW |