| 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("../build/webrtc.gni") | 9 import("../build/webrtc.gni") |
| 10 | 10 |
| (...skipping 60 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 71 | 71 |
| 72 if (is_win) { | 72 if (is_win) { |
| 73 defines = [ "WEBRTC_DRIFT_COMPENSATION_SUPPORTED" ] | 73 defines = [ "WEBRTC_DRIFT_COMPENSATION_SUPPORTED" ] |
| 74 | 74 |
| 75 cflags = [ | 75 cflags = [ |
| 76 # TODO(kjellander): Bug 261: fix this warning. | 76 # TODO(kjellander): Bug 261: fix this warning. |
| 77 "/wd4373", # Virtual function override. | 77 "/wd4373", # Virtual function override. |
| 78 ] | 78 ] |
| 79 } | 79 } |
| 80 | 80 |
| 81 configs += [ "..:common_config" ] | |
| 82 public_configs = [ "..:common_inherited_config" ] | 81 public_configs = [ "..:common_inherited_config" ] |
| 83 | 82 |
| 84 if (is_clang) { | 83 if (is_clang) { |
| 85 # Suppress warnings from Chrome's Clang plugins. | 84 # Suppress warnings from Chrome's Clang plugins. |
| 86 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 85 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 87 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 86 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 88 } | 87 } |
| 89 | 88 |
| 90 deps = [ | 89 deps = [ |
| 91 ":level_indicator", | 90 ":level_indicator", |
| (...skipping 14 matching lines...) Expand all Loading... |
| 106 "../system_wrappers", | 105 "../system_wrappers", |
| 107 ] | 106 ] |
| 108 } | 107 } |
| 109 | 108 |
| 110 rtc_source_set("level_indicator") { | 109 rtc_source_set("level_indicator") { |
| 111 sources = [ | 110 sources = [ |
| 112 "level_indicator.cc", | 111 "level_indicator.cc", |
| 113 "level_indicator.h", | 112 "level_indicator.h", |
| 114 ] | 113 ] |
| 115 | 114 |
| 116 configs += [ "..:common_config" ] | |
| 117 public_configs = [ "..:common_inherited_config" ] | 115 public_configs = [ "..:common_inherited_config" ] |
| 118 | 116 |
| 119 deps = [ | 117 deps = [ |
| 120 "..:webrtc_common", | 118 "..:webrtc_common", |
| 121 "../base:rtc_base_approved", | 119 "../base:rtc_base_approved", |
| 122 "../common_audio", | 120 "../common_audio", |
| 123 ] | 121 ] |
| 124 } | 122 } |
| 125 | 123 |
| 126 if (rtc_include_tests) { | 124 if (rtc_include_tests) { |
| (...skipping 135 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 262 } | 260 } |
| 263 | 261 |
| 264 if (is_clang) { | 262 if (is_clang) { |
| 265 # Suppress warnings from Chrome's Clang plugins. | 263 # Suppress warnings from Chrome's Clang plugins. |
| 266 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. | 264 # See http://code.google.com/p/webrtc/issues/detail?id=163 for details. |
| 267 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 265 suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] |
| 268 } | 266 } |
| 269 } | 267 } |
| 270 } | 268 } |
| 271 } | 269 } |
| OLD | NEW |