| 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 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. | 9 # TODO(kjellander): Rebase this to webrtc/build/common.gypi changes after r6330. | 
| 10 | 10 | 
| (...skipping 276 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 287 | 287 | 
| 288 if (!build_with_chromium) { | 288 if (!build_with_chromium) { | 
| 289   executable("webrtc_tests") { | 289   executable("webrtc_tests") { | 
| 290     testonly = true | 290     testonly = true | 
| 291     deps = [ | 291     deps = [ | 
| 292       ":webrtc", | 292       ":webrtc", | 
| 293       "modules/video_capture:video_capture_internal_impl", | 293       "modules/video_capture:video_capture_internal_impl", | 
| 294       "test", | 294       "test", | 
| 295     ] | 295     ] | 
| 296   } | 296   } | 
|  | 297 | 
|  | 298   executable("video_loopback") { | 
|  | 299     testonly = true | 
|  | 300     sources = [ | 
|  | 301       "test/run_test.h", | 
|  | 302       "video/video_loopback.cc", | 
|  | 303     ] | 
|  | 304 | 
|  | 305     if (is_mac) { | 
|  | 306       sources += [ "test/mac/run_test.mm" ] | 
|  | 307     } else { | 
|  | 308       sources += [ "test/run_test.cc" ] | 
|  | 309     } | 
|  | 310     deps = [ | 
|  | 311       ":video_quality_test", | 
|  | 312       "system_wrappers:metrics_default", | 
|  | 313       "test:field_trial", | 
|  | 314       "test:test_common", | 
|  | 315       "test:test_renderer", | 
|  | 316       "//testing/gmock", | 
|  | 317       "//testing/gtest", | 
|  | 318       "//third_party/gflags", | 
|  | 319     ] | 
|  | 320     if (is_clang && !is_nacl) { | 
|  | 321       # Suppress warnings from Chrome's Clang plugins. | 
|  | 322       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
|  | 323       configs -= [ "//build/config/clang:find_bad_constructs" ] | 
|  | 324     } | 
|  | 325   } | 
| 297 } | 326 } | 
| 298 | 327 | 
| 299 source_set("webrtc_common") { | 328 source_set("webrtc_common") { | 
| 300   sources = [ | 329   sources = [ | 
| 301     "audio_sink.h", | 330     "audio_sink.h", | 
| 302     "common_types.cc", | 331     "common_types.cc", | 
| 303     "common_types.h", | 332     "common_types.h", | 
| 304     "config.cc", | 333     "config.cc", | 
| 305     "config.h", | 334     "config.h", | 
| 306     "engine_configurations.h", | 335     "engine_configurations.h", | 
| (...skipping 459 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 766     if (is_ios || (is_mac && target_cpu != "x86")) { | 795     if (is_ios || (is_mac && target_cpu != "x86")) { | 
| 767       defines = [ "CARBON_DEPRECATED=YES" ] | 796       defines = [ "CARBON_DEPRECATED=YES" ] | 
| 768     } | 797     } | 
| 769     if (is_clang) { | 798     if (is_clang) { | 
| 770       # Suppress warnings from the Chromium Clang plugin. | 799       # Suppress warnings from the Chromium Clang plugin. | 
| 771       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 800       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
| 772       configs -= [ "//build/config/clang:find_bad_constructs" ] | 801       configs -= [ "//build/config/clang:find_bad_constructs" ] | 
| 773     } | 802     } | 
| 774   } | 803   } | 
| 775 } | 804 } | 
| OLD | NEW | 
|---|