| OLD | NEW | 
|---|
| 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/webrtc.gni") | 9 import("../build/webrtc.gni") | 
| 10 import("//build/config/ui.gni") | 10 import("//build/config/ui.gni") | 
| (...skipping 20 matching lines...) Expand all  Loading... | 
| 31   testonly = true | 31   testonly = true | 
| 32   sources = [ | 32   sources = [ | 
| 33     "fake_texture_frame.cc", | 33     "fake_texture_frame.cc", | 
| 34     "fake_texture_frame.h", | 34     "fake_texture_frame.h", | 
| 35     "frame_generator.cc", | 35     "frame_generator.cc", | 
| 36     "frame_generator.h", | 36     "frame_generator.h", | 
| 37     "frame_utils.cc", | 37     "frame_utils.cc", | 
| 38     "frame_utils.h", | 38     "frame_utils.h", | 
| 39   ] | 39   ] | 
| 40 | 40 | 
| 41   if (is_clang && !is_nacl) { | 41   if (!build_with_chromium && is_clang) { | 
| 42     # Suppress warnings from the Chromium Clang plugin. | 42     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 
| 43     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |  | 
| 44     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 43     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 45   } | 44   } | 
| 46 | 45 | 
| 47   deps = [ | 46   deps = [ | 
| 48     "../common_video", | 47     "../common_video", | 
| 49   ] | 48   ] | 
| 50 } | 49 } | 
| 51 | 50 | 
| 52 rtc_source_set("rtp_test_utils") { | 51 rtc_source_set("rtp_test_utils") { | 
| 53   testonly = true | 52   testonly = true | 
| 54   sources = [ | 53   sources = [ | 
| 55     "rtcp_packet_parser.cc", | 54     "rtcp_packet_parser.cc", | 
| 56     "rtcp_packet_parser.h", | 55     "rtcp_packet_parser.h", | 
| 57     "rtp_file_reader.cc", | 56     "rtp_file_reader.cc", | 
| 58     "rtp_file_reader.h", | 57     "rtp_file_reader.h", | 
| 59     "rtp_file_writer.cc", | 58     "rtp_file_writer.cc", | 
| 60     "rtp_file_writer.h", | 59     "rtp_file_writer.h", | 
| 61   ] | 60   ] | 
| 62 | 61 | 
| 63   if (is_clang && !is_nacl) { | 62   if (!build_with_chromium && is_clang) { | 
| 64     # Suppress warnings from the Chromium Clang plugin. | 63     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 
| 65     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |  | 
| 66     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 64     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 67   } | 65   } | 
| 68 | 66 | 
| 69   deps = [ | 67   deps = [ | 
| 70     "..:webrtc_common", | 68     "..:webrtc_common", | 
| 71     "../modules/rtp_rtcp", | 69     "../modules/rtp_rtcp", | 
| 72     "//testing/gtest", | 70     "//testing/gtest", | 
| 73   ] | 71   ] | 
| 74 } | 72 } | 
| 75 | 73 | 
| (...skipping 54 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 130   deps = [ | 128   deps = [ | 
| 131     ":video_test_common", | 129     ":video_test_common", | 
| 132     "../base:gtest_prod", | 130     "../base:gtest_prod", | 
| 133     "../base:rtc_base_approved", | 131     "../base:rtc_base_approved", | 
| 134     "../common_video", | 132     "../common_video", | 
| 135     "../system_wrappers", | 133     "../system_wrappers", | 
| 136     "//testing/gmock", | 134     "//testing/gmock", | 
| 137     "//testing/gtest", | 135     "//testing/gtest", | 
| 138   ] | 136   ] | 
| 139 | 137 | 
| 140   if (is_clang) { | 138   if (!build_with_chromium && is_clang) { | 
| 141     # Suppress warnings from the Chromium Clang plugin. | 139     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 
| 142     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |  | 
| 143     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 140     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 144   } | 141   } | 
| 145 | 142 | 
| 146   if (is_ios) { | 143   if (is_ios) { | 
| 147     configs += [ "//build/config/compiler:enable_arc" ] | 144     configs += [ "//build/config/compiler:enable_arc" ] | 
| 148   } | 145   } | 
| 149 | 146 | 
| 150   if (use_x11) { | 147   if (use_x11) { | 
| 151     deps += [ "//tools/xdisplaycheck" ] | 148     deps += [ "//tools/xdisplaycheck" ] | 
| 152   } | 149   } | 
| (...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 233     "testsupport/unittest_utils.h", | 230     "testsupport/unittest_utils.h", | 
| 234   ] | 231   ] | 
| 235 | 232 | 
| 236   # TODO(jschuh): Bug 1348: fix this warning. | 233   # TODO(jschuh): Bug 1348: fix this warning. | 
| 237   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | 234   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | 
| 238 | 235 | 
| 239   if (is_win) { | 236   if (is_win) { | 
| 240     cflags = [ "/wd4373" ]  # virtual override w/different const/volatile signat
     ure. | 237     cflags = [ "/wd4373" ]  # virtual override w/different const/volatile signat
     ure. | 
| 241   } | 238   } | 
| 242 | 239 | 
| 243   if (is_clang) { | 240   if (!build_with_chromium && is_clang) { | 
| 244     # Suppress warnings from the Chromium Clang plugin. | 241     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 
| 245     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |  | 
| 246     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 242     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 247   } | 243   } | 
| 248 | 244 | 
| 249   data = test_support_unittests_resources | 245   data = test_support_unittests_resources | 
| 250   if (is_android) { | 246   if (is_android) { | 
| 251     deps += [ "//testing/android/native_test:native_test_support" ] | 247     deps += [ "//testing/android/native_test:native_test_support" ] | 
| 252     shard_timeout = 900 | 248     shard_timeout = 900 | 
| 253   } | 249   } | 
| 254 | 250 | 
| 255   if (is_ios) { | 251   if (is_ios) { | 
| (...skipping 50 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 306     "video_capturer.h", | 302     "video_capturer.h", | 
| 307     "win/run_loop_win.cc", | 303     "win/run_loop_win.cc", | 
| 308   ] | 304   ] | 
| 309   if (!is_win) { | 305   if (!is_win) { | 
| 310     sources += [ | 306     sources += [ | 
| 311       "run_loop.cc", | 307       "run_loop.cc", | 
| 312       "run_loop.h", | 308       "run_loop.h", | 
| 313     ] | 309     ] | 
| 314   } | 310   } | 
| 315 | 311 | 
| 316   if (is_clang && !is_nacl) { | 312   if (!build_with_chromium && is_clang) { | 
| 317     # Suppress warnings from the Chromium Clang plugin. | 313     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 
| 318     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |  | 
| 319     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 314     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 320   } | 315   } | 
| 321 | 316 | 
| 322   deps = [ | 317   deps = [ | 
| 323     ":rtp_test_utils", | 318     ":rtp_test_utils", | 
| 324     ":test_support", | 319     ":test_support", | 
| 325     "..:webrtc_common", | 320     "..:webrtc_common", | 
| 326     "../audio", | 321     "../audio", | 
| 327     "../base:rtc_base_approved", | 322     "../base:rtc_base_approved", | 
| 328     "../call", | 323     "../call", | 
| (...skipping 57 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 386   if (is_mac) { | 381   if (is_mac) { | 
| 387     libs = [ | 382     libs = [ | 
| 388       "Cocoa.framework", | 383       "Cocoa.framework", | 
| 389       "OpenGL.framework", | 384       "OpenGL.framework", | 
| 390       "CoreVideo.framework", | 385       "CoreVideo.framework", | 
| 391     ] | 386     ] | 
| 392   } | 387   } | 
| 393 | 388 | 
| 394   public_configs = [ ":test_renderer_exported_config" ] | 389   public_configs = [ ":test_renderer_exported_config" ] | 
| 395 | 390 | 
| 396   if (is_clang && !is_nacl) { | 391   if (!build_with_chromium && is_clang) { | 
| 397     # Suppress warnings from the Chromium Clang plugin. | 392     # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 
| 398     # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |  | 
| 399     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 393     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| 400   } | 394   } | 
| 401 | 395 | 
| 402   deps = [ | 396   deps = [ | 
| 403     ":test_support", | 397     ":test_support", | 
| 404     ":video_test_common", | 398     ":video_test_common", | 
| 405     "../modules/media_file", | 399     "../modules/media_file", | 
| 406     "//testing/gtest", | 400     "//testing/gtest", | 
| 407   ] | 401   ] | 
| 408 } | 402 } | 
| OLD | NEW | 
|---|