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 312 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
323 if (is_clang && !is_nacl) { | 323 if (is_clang && !is_nacl) { |
324 # Suppress warnings from Chrome's Clang plugins. | 324 # Suppress warnings from Chrome's Clang plugins. |
325 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 325 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
326 configs -= [ "//build/config/clang:find_bad_constructs" ] | 326 configs -= [ "//build/config/clang:find_bad_constructs" ] |
327 } | 327 } |
328 } | 328 } |
329 } | 329 } |
330 | 330 |
331 source_set("webrtc_common") { | 331 source_set("webrtc_common") { |
332 sources = [ | 332 sources = [ |
333 "audio_sink.h", | |
hlundin-webrtc
2016/09/05 11:28:42
Why did audio_sink.h have to go?
kjellander_webrtc
2016/09/05 11:49:46
My comment in PS#3: This should have been moved in
hlundin-webrtc
2016/09/05 11:56:19
Acknowledged.
| |
334 "common.cc", | |
335 "common.h", | |
336 "common_types.cc", | 333 "common_types.cc", |
337 "common_types.h", | 334 "common_types.h", |
338 "config.cc", | 335 "config.cc", |
339 "config.h", | 336 "config.h", |
340 "engine_configurations.h", | 337 "engine_configurations.h", |
341 "typedefs.h", | 338 "typedefs.h", |
342 ] | 339 ] |
343 | 340 |
344 configs += [ ":common_config" ] | 341 configs += [ ":common_config" ] |
345 public_configs = [ ":common_inherited_config" ] | 342 public_configs = [ ":common_inherited_config" ] |
(...skipping 520 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
866 if (is_ios || (is_mac && target_cpu != "x86")) { | 863 if (is_ios || (is_mac && target_cpu != "x86")) { |
867 defines = [ "CARBON_DEPRECATED=YES" ] | 864 defines = [ "CARBON_DEPRECATED=YES" ] |
868 } | 865 } |
869 if (is_clang) { | 866 if (is_clang) { |
870 # Suppress warnings from the Chromium Clang plugin. | 867 # Suppress warnings from the Chromium Clang plugin. |
871 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 868 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
872 configs -= [ "//build/config/clang:find_bad_constructs" ] | 869 configs -= [ "//build/config/clang:find_bad_constructs" ] |
873 } | 870 } |
874 } | 871 } |
875 } | 872 } |
OLD | NEW |