| 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 313 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  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", |  333     "audio_sink.h", | 
 |  334     "common.cc", | 
 |  335     "common.h", | 
|  334     "common_types.cc", |  336     "common_types.cc", | 
|  335     "common_types.h", |  337     "common_types.h", | 
|  336     "config.cc", |  338     "config.cc", | 
|  337     "config.h", |  339     "config.h", | 
|  338     "engine_configurations.h", |  340     "engine_configurations.h", | 
|  339     "typedefs.h", |  341     "typedefs.h", | 
|  340   ] |  342   ] | 
|  341  |  343  | 
|  342   configs += [ ":common_config" ] |  344   configs += [ ":common_config" ] | 
|  343   public_configs = [ ":common_inherited_config" ] |  345   public_configs = [ ":common_inherited_config" ] | 
| (...skipping 481 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
|  825     if (is_ios || (is_mac && target_cpu != "x86")) { |  827     if (is_ios || (is_mac && target_cpu != "x86")) { | 
|  826       defines = [ "CARBON_DEPRECATED=YES" ] |  828       defines = [ "CARBON_DEPRECATED=YES" ] | 
|  827     } |  829     } | 
|  828     if (is_clang) { |  830     if (is_clang) { | 
|  829       # Suppress warnings from the Chromium Clang plugin. |  831       # Suppress warnings from the Chromium Clang plugin. | 
|  830       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |  832       # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 
|  831       configs -= [ "//build/config/clang:find_bad_constructs" ] |  833       configs -= [ "//build/config/clang:find_bad_constructs" ] | 
|  832     } |  834     } | 
|  833   } |  835   } | 
|  834 } |  836 } | 
| OLD | NEW |