| 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 307 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 318 if (is_clang && !is_nacl) { | 318 if (is_clang && !is_nacl) { |
| 319 # Suppress warnings from Chrome's Clang plugins. | 319 # Suppress warnings from Chrome's Clang plugins. |
| 320 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 320 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 321 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 321 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 322 } | 322 } |
| 323 } | 323 } |
| 324 } | 324 } |
| 325 | 325 |
| 326 rtc_source_set("webrtc_common") { | 326 rtc_source_set("webrtc_common") { |
| 327 sources = [ | 327 sources = [ |
| 328 "audio_sink.h", | |
| 329 "common.cc", | |
| 330 "common.h", | |
| 331 "common_types.cc", | 328 "common_types.cc", |
| 332 "common_types.h", | 329 "common_types.h", |
| 333 "config.cc", | 330 "config.cc", |
| 334 "config.h", | 331 "config.h", |
| 335 "engine_configurations.h", | 332 "engine_configurations.h", |
| 336 "typedefs.h", | 333 "typedefs.h", |
| 337 ] | 334 ] |
| 338 | 335 |
| 339 if (is_clang && !is_nacl) { | 336 if (is_clang && !is_nacl) { |
| 340 # Suppress warnings from Chrome's Clang plugins. | 337 # Suppress warnings from Chrome's Clang plugins. |
| (...skipping 490 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 831 if (is_ios || (is_mac && target_cpu != "x86")) { | 828 if (is_ios || (is_mac && target_cpu != "x86")) { |
| 832 defines = [ "CARBON_DEPRECATED=YES" ] | 829 defines = [ "CARBON_DEPRECATED=YES" ] |
| 833 } | 830 } |
| 834 if (is_clang) { | 831 if (is_clang) { |
| 835 # Suppress warnings from the Chromium Clang plugin. | 832 # Suppress warnings from the Chromium Clang plugin. |
| 836 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 833 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 837 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 834 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 838 } | 835 } |
| 839 } | 836 } |
| 840 } | 837 } |
| OLD | NEW |