| 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/config/android/config.gni") | 9 import("//build/config/android/config.gni") |
| 10 import("../build/webrtc.gni") | 10 import("../build/webrtc.gni") |
| (...skipping 103 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 114 | 114 |
| 115 if (is_linux || is_android) { | 115 if (is_linux || is_android) { |
| 116 sources += [ "source/atomic32_non_darwin_unix.cc" ] | 116 sources += [ "source/atomic32_non_darwin_unix.cc" ] |
| 117 } | 117 } |
| 118 | 118 |
| 119 if (is_ios || is_mac) { | 119 if (is_ios || is_mac) { |
| 120 defines += [ "WEBRTC_THREAD_RR" ] | 120 defines += [ "WEBRTC_THREAD_RR" ] |
| 121 sources += [ "source/atomic32_darwin.cc" ] | 121 sources += [ "source/atomic32_darwin.cc" ] |
| 122 } | 122 } |
| 123 | 123 |
| 124 # TODO(jschuh): Bug 1348: fix this warning. |
| 125 configs += [ "//build/config/compiler:no_size_t_to_int_warning" ] |
| 126 |
| 124 if (is_win) { | 127 if (is_win) { |
| 125 libs += [ "winmm.lib" ] | 128 libs += [ "winmm.lib" ] |
| 126 | 129 |
| 127 cflags = [ | 130 cflags = [ "/wd4334" ] # Ignore warning on shift operator promotion. |
| 128 "/wd4267", # size_t to int truncation. | |
| 129 "/wd4334", # Ignore warning on shift operator promotion. | |
| 130 ] | |
| 131 } | 131 } |
| 132 | 132 |
| 133 deps += [ "../base:rtc_base_approved" ] | 133 deps += [ "../base:rtc_base_approved" ] |
| 134 } | 134 } |
| 135 | 135 |
| 136 source_set("field_trial_default") { | 136 source_set("field_trial_default") { |
| 137 sources = [ | 137 sources = [ |
| 138 "include/field_trial_default.h", | 138 "include/field_trial_default.h", |
| 139 "source/field_trial_default.cc", | 139 "source/field_trial_default.cc", |
| 140 ] | 140 ] |
| (...skipping 40 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 181 if (is_linux) { | 181 if (is_linux) { |
| 182 source_set("cpu_features_linux") { | 182 source_set("cpu_features_linux") { |
| 183 sources = [ | 183 sources = [ |
| 184 "source/cpu_features_linux.c", | 184 "source/cpu_features_linux.c", |
| 185 ] | 185 ] |
| 186 | 186 |
| 187 configs += [ "..:common_config" ] | 187 configs += [ "..:common_config" ] |
| 188 public_configs = [ "..:common_inherited_config" ] | 188 public_configs = [ "..:common_inherited_config" ] |
| 189 } | 189 } |
| 190 } | 190 } |
| OLD | NEW |