| 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 10 matching lines...) Expand all Loading... |
| 21 "HAVE_WEBRTC_VOICE", | 21 "HAVE_WEBRTC_VOICE", |
| 22 ] | 22 ] |
| 23 } | 23 } |
| 24 | 24 |
| 25 config("rtc_media_warnings_config") { | 25 config("rtc_media_warnings_config") { |
| 26 # GN orders flags on a target before flags from configs. The default config | 26 # GN orders flags on a target before flags from configs. The default config |
| 27 # adds these flags so to cancel them out they need to come from a config and | 27 # adds these flags so to cancel them out they need to come from a config and |
| 28 # cannot be on the target directly. | 28 # cannot be on the target directly. |
| 29 if (!is_win) { | 29 if (!is_win) { |
| 30 cflags = [ "-Wno-deprecated-declarations" ] | 30 cflags = [ "-Wno-deprecated-declarations" ] |
| 31 cflags_cc = [ "-Wno-overloaded-virtual" ] | |
| 32 } | 31 } |
| 33 } | 32 } |
| 34 | 33 |
| 35 if (is_linux && rtc_use_gtk) { | 34 if (is_linux && rtc_use_gtk) { |
| 36 pkg_config("gtk-lib") { | 35 pkg_config("gtk-lib") { |
| 37 packages = [ | 36 packages = [ |
| 38 "gobject-2.0", | 37 "gobject-2.0", |
| 39 "gthread-2.0", | 38 "gthread-2.0", |
| 40 "gtk+-2.0", | 39 "gtk+-2.0", |
| 41 ] | 40 ] |
| (...skipping 198 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 240 if (is_clang && is_win) { | 239 if (is_clang && is_win) { |
| 241 cflags = [ | 240 cflags = [ |
| 242 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6266 | 241 # See https://bugs.chromium.org/p/webrtc/issues/detail?id=6266 |
| 243 # for -Wno-sign-compare | 242 # for -Wno-sign-compare |
| 244 "-Wno-sign-compare", | 243 "-Wno-sign-compare", |
| 245 "-Wno-unused-function", | 244 "-Wno-unused-function", |
| 246 ] | 245 ] |
| 247 } | 246 } |
| 248 if (!is_win) { | 247 if (!is_win) { |
| 249 cflags = [ "-Wno-sign-compare" ] | 248 cflags = [ "-Wno-sign-compare" ] |
| 250 cflags_cc = [ "-Wno-overloaded-virtual" ] | |
| 251 } | 249 } |
| 252 } | 250 } |
| 253 | 251 |
| 254 rtc_media_unittests_resources = [ | 252 rtc_media_unittests_resources = [ |
| 255 "//resources/media/captured-320x240-2s-48.frames", | 253 "//resources/media/captured-320x240-2s-48.frames", |
| 256 "//resources/media/faces.1280x720_P420.yuv", | 254 "//resources/media/faces.1280x720_P420.yuv", |
| 257 "//resources/media/faces_I420.jpg", | 255 "//resources/media/faces_I420.jpg", |
| 258 "//resources/media/faces_I422.jpg", | 256 "//resources/media/faces_I422.jpg", |
| 259 "//resources/media/faces_I444.jpg", | 257 "//resources/media/faces_I444.jpg", |
| 260 "//resources/media/faces_I411.jpg", | 258 "//resources/media/faces_I411.jpg", |
| (...skipping 73 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 334 deps += [ | 332 deps += [ |
| 335 # TODO(kjellander): Move as part of work in bugs.webrtc.org/4243. | 333 # TODO(kjellander): Move as part of work in bugs.webrtc.org/4243. |
| 336 ":rtc_media", | 334 ":rtc_media", |
| 337 ":rtc_unittest_main", | 335 ":rtc_unittest_main", |
| 338 "../audio", | 336 "../audio", |
| 339 "../base:rtc_base_tests_utils", | 337 "../base:rtc_base_tests_utils", |
| 340 "../system_wrappers:metrics_default", | 338 "../system_wrappers:metrics_default", |
| 341 ] | 339 ] |
| 342 } | 340 } |
| 343 } | 341 } |
| OLD | NEW |