Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(225)

Side by Side Diff: webrtc/system_wrappers/BUILD.gn

Issue 1347793005: Replace Atomic32 with webrtc/base/atomicops.h. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: fix typo Created 5 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch
OLDNEW
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")
11 11
12 static_library("system_wrappers") { 12 static_library("system_wrappers") {
13 sources = [ 13 sources = [
14 "interface/aligned_array.h", 14 "interface/aligned_array.h",
15 "interface/aligned_malloc.h", 15 "interface/aligned_malloc.h",
16 "interface/atomic32.h",
17 "interface/clock.h", 16 "interface/clock.h",
18 "interface/condition_variable_wrapper.h", 17 "interface/condition_variable_wrapper.h",
19 "interface/cpu_features_wrapper.h", 18 "interface/cpu_features_wrapper.h",
20 "interface/cpu_info.h", 19 "interface/cpu_info.h",
21 "interface/critical_section_wrapper.h", 20 "interface/critical_section_wrapper.h",
22 "interface/data_log.h", 21 "interface/data_log.h",
23 "interface/data_log_c.h", 22 "interface/data_log_c.h",
24 "interface/data_log_impl.h", 23 "interface/data_log_impl.h",
25 "interface/event_tracer.h", 24 "interface/event_tracer.h",
26 "interface/event_wrapper.h", 25 "interface/event_wrapper.h",
(...skipping 11 matching lines...) Expand all
38 "interface/static_instance.h", 37 "interface/static_instance.h",
39 "interface/stl_util.h", 38 "interface/stl_util.h",
40 "interface/stringize_macros.h", 39 "interface/stringize_macros.h",
41 "interface/thread_wrapper.h", 40 "interface/thread_wrapper.h",
42 "interface/tick_util.h", 41 "interface/tick_util.h",
43 "interface/timestamp_extrapolator.h", 42 "interface/timestamp_extrapolator.h",
44 "interface/trace.h", 43 "interface/trace.h",
45 "interface/trace_event.h", 44 "interface/trace_event.h",
46 "interface/utf_util_win.h", 45 "interface/utf_util_win.h",
47 "source/aligned_malloc.cc", 46 "source/aligned_malloc.cc",
48 "source/atomic32_mac.cc",
49 "source/atomic32_win.cc",
50 "source/clock.cc", 47 "source/clock.cc",
51 "source/condition_variable.cc", 48 "source/condition_variable.cc",
52 "source/condition_variable_event_win.cc", 49 "source/condition_variable_event_win.cc",
53 "source/condition_variable_event_win.h", 50 "source/condition_variable_event_win.h",
54 "source/condition_variable_native_win.cc", 51 "source/condition_variable_native_win.cc",
55 "source/condition_variable_native_win.h", 52 "source/condition_variable_native_win.h",
56 "source/condition_variable_posix.cc", 53 "source/condition_variable_posix.cc",
57 "source/condition_variable_posix.h", 54 "source/condition_variable_posix.h",
58 "source/cpu_features.cc", 55 "source/cpu_features.cc",
59 "source/cpu_info.cc", 56 "source/cpu_info.cc",
(...skipping 78 matching lines...) Expand 10 before | Expand all | Expand 10 after
138 defines += [ 135 defines += [
139 "WEBRTC_THREAD_RR", 136 "WEBRTC_THREAD_RR",
140 # TODO(andrew): can we select this automatically? 137 # TODO(andrew): can we select this automatically?
141 # Define this if the Linux system does not support CLOCK_MONOTONIC. 138 # Define this if the Linux system does not support CLOCK_MONOTONIC.
142 #"WEBRTC_CLOCK_TYPE_REALTIME", 139 #"WEBRTC_CLOCK_TYPE_REALTIME",
143 ] 140 ]
144 141
145 libs += [ "rt" ] 142 libs += [ "rt" ]
146 } 143 }
147 144
148 if (!is_mac && !is_ios) {
149 sources += [ "source/atomic32_posix.cc" ]
150 }
151
152 if (is_ios || is_mac) { 145 if (is_ios || is_mac) {
153 defines += [ 146 defines += [
154 "WEBRTC_THREAD_RR", 147 "WEBRTC_THREAD_RR",
155 "WEBRTC_CLOCK_TYPE_REALTIME", 148 "WEBRTC_CLOCK_TYPE_REALTIME",
156 ] 149 ]
157 } 150 }
158 151
159 if (is_ios) {
160 sources += [ "source/atomic32_mac.cc" ]
161 }
162
163 if (is_win) { 152 if (is_win) {
164 libs += [ "winmm.lib" ] 153 libs += [ "winmm.lib" ]
165 154
166 cflags = [ 155 cflags = [
167 "/wd4267", # size_t to int truncation. 156 "/wd4267", # size_t to int truncation.
168 "/wd4334", # Ignore warning on shift operator promotion. 157 "/wd4334", # Ignore warning on shift operator promotion.
169 ] 158 ]
170 } 159 }
171 160
172 deps += [ "../base:rtc_base_approved" ] 161 deps += [ "../base:rtc_base_approved" ]
(...skipping 42 matching lines...) Expand 10 before | Expand all | Expand 10 after
215 "source/cpu_features_android.c", 204 "source/cpu_features_android.c",
216 ] 205 ]
217 206
218 configs += [ "..:common_config" ] 207 configs += [ "..:common_config" ]
219 public_configs = [ "..:common_inherited_config" ] 208 public_configs = [ "..:common_inherited_config" ]
220 deps = [ 209 deps = [
221 "//third_party/android_tools:cpu_features", 210 "//third_party/android_tools:cpu_features",
222 ] 211 ]
223 } 212 }
224 } 213 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698