| 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("../../webrtc.gni") |    9 import("../../webrtc.gni") | 
|   10  |   10  | 
| (...skipping 259 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  270     "../../common_video", |  270     "../../common_video", | 
|  271     "../../rtc_base:rtc_base_approved", |  271     "../../rtc_base:rtc_base_approved", | 
|  272     "../../system_wrappers", |  272     "../../system_wrappers", | 
|  273   ] |  273   ] | 
|  274   if (rtc_build_libvpx) { |  274   if (rtc_build_libvpx) { | 
|  275     deps += [ rtc_libvpx_dir ] |  275     deps += [ rtc_libvpx_dir ] | 
|  276   } |  276   } | 
|  277 } |  277 } | 
|  278  |  278  | 
|  279 if (rtc_include_tests) { |  279 if (rtc_include_tests) { | 
 |  280   if (is_ios || is_mac) { | 
 |  281     rtc_static_library("objc_codec_test") { | 
 |  282       sources = [ | 
 |  283         "codecs/test/objc_codec_h264_test.h", | 
 |  284         "codecs/test/objc_codec_h264_test.mm", | 
 |  285       ] | 
 |  286       deps = [ | 
 |  287         "../../api:video_frame_api", | 
 |  288         "../../api/video_codecs:video_codecs_api", | 
 |  289         "../../media:rtc_audio_video", | 
 |  290         "../../modules:module_api", | 
 |  291         "../../sdk:objc_common", | 
 |  292         "../../sdk:objc_peerconnection", | 
 |  293         "../../sdk:objc_peerconnectionfactory", | 
 |  294         "../../sdk:objc_videotoolbox", | 
 |  295         "../../sdk:objc_videotracksource", | 
 |  296       ] | 
 |  297  | 
 |  298       if (!build_with_chromium && is_clang) { | 
 |  299         # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163)
     . | 
 |  300         suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
 |  301       } | 
 |  302     } | 
 |  303   } | 
 |  304  | 
|  280   rtc_source_set("simulcast_test_utility") { |  305   rtc_source_set("simulcast_test_utility") { | 
|  281     testonly = true |  306     testonly = true | 
|  282     sources = [ |  307     sources = [ | 
|  283       "codecs/vp8/simulcast_test_utility.h", |  308       "codecs/vp8/simulcast_test_utility.h", | 
|  284     ] |  309     ] | 
|  285  |  310  | 
|  286     if (!build_with_chromium && is_clang) { |  311     if (!build_with_chromium && is_clang) { | 
|  287       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |  312       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 
|  288       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |  313       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
|  289     } |  314     } | 
| (...skipping 102 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  392  |  417  | 
|  393       deps += [ |  418       deps += [ | 
|  394         "../../rtc_base:rtc_base_approved", |  419         "../../rtc_base:rtc_base_approved", | 
|  395         "../../sdk/android:libjingle_peerconnection_jni", |  420         "../../sdk/android:libjingle_peerconnection_jni", | 
|  396         "//base", |  421         "//base", | 
|  397       ] |  422       ] | 
|  398     } |  423     } | 
|  399  |  424  | 
|  400     if (is_ios || is_mac) { |  425     if (is_ios || is_mac) { | 
|  401       deps += [ |  426       deps += [ | 
 |  427         ":objc_codec_test", | 
|  402         "../../media:rtc_media_base", |  428         "../../media:rtc_media_base", | 
|  403         "../../sdk:objc_videotoolbox", |  429         "../../sdk:objc_videotoolbox", | 
|  404       ] |  430       ] | 
|  405     } |  431     } | 
|  406   } |  432   } | 
|  407  |  433  | 
|  408   rtc_source_set("video_coding_modules_tests") { |  434   rtc_source_set("video_coding_modules_tests") { | 
|  409     testonly = true |  435     testonly = true | 
|  410  |  436  | 
|  411     # Skip restricting visibility on mobile platforms since the tests on those |  437     # Skip restricting visibility on mobile platforms since the tests on those | 
| (...skipping 16 matching lines...) Expand all  Loading... | 
|  428       ":webrtc_vp8", |  454       ":webrtc_vp8", | 
|  429       ":webrtc_vp9", |  455       ":webrtc_vp9", | 
|  430       "../../api:video_frame_api", |  456       "../../api:video_frame_api", | 
|  431       "../../common_video:common_video", |  457       "../../common_video:common_video", | 
|  432       "../../rtc_base:rtc_base_approved", |  458       "../../rtc_base:rtc_base_approved", | 
|  433       "../../test:test_support", |  459       "../../test:test_support", | 
|  434       "../../test:video_test_common", |  460       "../../test:video_test_common", | 
|  435       "../video_capture", |  461       "../video_capture", | 
|  436     ] |  462     ] | 
|  437  |  463  | 
 |  464     if (is_ios || is_mac) { | 
 |  465       deps += [ ":objc_codec_test" ] | 
 |  466     } | 
 |  467  | 
|  438     if (rtc_use_h264) { |  468     if (rtc_use_h264) { | 
|  439       defines = [ "WEBRTC_VIDEOPROCESSOR_H264_TESTS" ] |  469       defines = [ "WEBRTC_VIDEOPROCESSOR_H264_TESTS" ] | 
|  440     } |  470     } | 
|  441  |  471  | 
|  442     if (!build_with_chromium && is_clang) { |  472     if (!build_with_chromium && is_clang) { | 
|  443       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |  473       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 
|  444       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |  474       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
|  445     } |  475     } | 
|  446   } |  476   } | 
|  447  |  477  | 
| (...skipping 44 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  492         "../../sdk/android:libjingle_peerconnection_java", |  522         "../../sdk/android:libjingle_peerconnection_java", | 
|  493         "../../sdk/android:libjingle_peerconnection_jni", |  523         "../../sdk/android:libjingle_peerconnection_jni", | 
|  494         "//base", |  524         "//base", | 
|  495         "//testing/android/native_test:native_test_support", |  525         "//testing/android/native_test:native_test_support", | 
|  496       ] |  526       ] | 
|  497  |  527  | 
|  498       shard_timeout = 900 |  528       shard_timeout = 900 | 
|  499     } |  529     } | 
|  500  |  530  | 
|  501     if (is_ios || is_mac) { |  531     if (is_ios || is_mac) { | 
|  502       deps += [ ":plot_videoprocessor_integrationtest_bundle_data" ] |  532       deps += [ | 
 |  533         ":objc_codec_test", | 
 |  534         ":plot_videoprocessor_integrationtest_bundle_data", | 
 |  535       ] | 
|  503     } |  536     } | 
|  504  |  537  | 
|  505     # TODO(brandtr): Remove this define when the modules_tests target properly |  538     # TODO(brandtr): Remove this define when the modules_tests target properly | 
|  506     # loads the Java classes mentioned above. |  539     # loads the Java classes mentioned above. | 
|  507     defines = [ "WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED" ] |  540     defines = [ "WEBRTC_VIDEOPROCESSOR_INTEGRATIONTEST_HW_CODECS_ENABLED" ] | 
|  508  |  541  | 
|  509     if (!build_with_chromium && is_clang) { |  542     if (!build_with_chromium && is_clang) { | 
|  510       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |  543       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 
|  511       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |  544       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
|  512     } |  545     } | 
| (...skipping 86 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  599     } |  632     } | 
|  600  |  633  | 
|  601     # TODO(jschuh): bugs.webrtc.org/1348: fix this warning. |  634     # TODO(jschuh): bugs.webrtc.org/1348: fix this warning. | 
|  602     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |  635     configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] | 
|  603     if (!build_with_chromium && is_clang) { |  636     if (!build_with_chromium && is_clang) { | 
|  604       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). |  637       # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163). | 
|  605       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |  638       suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
|  606     } |  639     } | 
|  607   } |  640   } | 
|  608 } |  641 } | 
| OLD | NEW |