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

Side by Side Diff: webrtc/system_wrappers/system_wrappers.gyp

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) 2012 The WebRTC project authors. All Rights Reserved. 1 # Copyright (c) 2012 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 { 9 {
10 'includes': [ '../build/common.gypi', ], 10 'includes': [ '../build/common.gypi', ],
11 'targets': [ 11 'targets': [
12 { 12 {
13 'target_name': 'system_wrappers', 13 'target_name': 'system_wrappers',
14 'type': 'static_library', 14 'type': 'static_library',
15 'dependencies': [ 15 'dependencies': [
16 '<(webrtc_root)/common.gyp:webrtc_common', 16 '<(webrtc_root)/common.gyp:webrtc_common',
17 '../base/base.gyp:rtc_base_approved', 17 '../base/base.gyp:rtc_base_approved',
18 ], 18 ],
19 'sources': [ 19 'sources': [
20 'interface/aligned_array.h', 20 'interface/aligned_array.h',
21 'interface/aligned_malloc.h', 21 'interface/aligned_malloc.h',
22 'interface/atomic32.h',
23 'interface/clock.h', 22 'interface/clock.h',
24 'interface/condition_variable_wrapper.h', 23 'interface/condition_variable_wrapper.h',
25 'interface/cpu_info.h', 24 'interface/cpu_info.h',
26 'interface/cpu_features_wrapper.h', 25 'interface/cpu_features_wrapper.h',
27 'interface/critical_section_wrapper.h', 26 'interface/critical_section_wrapper.h',
28 'interface/data_log.h', 27 'interface/data_log.h',
29 'interface/data_log_c.h', 28 'interface/data_log_c.h',
30 'interface/data_log_impl.h', 29 'interface/data_log_impl.h',
31 'interface/event_tracer.h', 30 'interface/event_tracer.h',
32 'interface/event_wrapper.h', 31 'interface/event_wrapper.h',
(...skipping 12 matching lines...) Expand all
45 'interface/static_instance.h', 44 'interface/static_instance.h',
46 'interface/stl_util.h', 45 'interface/stl_util.h',
47 'interface/stringize_macros.h', 46 'interface/stringize_macros.h',
48 'interface/thread_wrapper.h', 47 'interface/thread_wrapper.h',
49 'interface/tick_util.h', 48 'interface/tick_util.h',
50 'interface/timestamp_extrapolator.h', 49 'interface/timestamp_extrapolator.h',
51 'interface/trace.h', 50 'interface/trace.h',
52 'interface/trace_event.h', 51 'interface/trace_event.h',
53 'interface/utf_util_win.h', 52 'interface/utf_util_win.h',
54 'source/aligned_malloc.cc', 53 'source/aligned_malloc.cc',
55 'source/atomic32_mac.cc',
56 'source/atomic32_posix.cc',
57 'source/atomic32_win.cc',
58 'source/clock.cc', 54 'source/clock.cc',
59 'source/condition_variable.cc', 55 'source/condition_variable.cc',
60 'source/condition_variable_posix.cc', 56 'source/condition_variable_posix.cc',
61 'source/condition_variable_posix.h', 57 'source/condition_variable_posix.h',
62 'source/condition_variable_event_win.cc', 58 'source/condition_variable_event_win.cc',
63 'source/condition_variable_event_win.h', 59 'source/condition_variable_event_win.h',
64 'source/condition_variable_native_win.cc', 60 'source/condition_variable_native_win.cc',
65 'source/condition_variable_native_win.h', 61 'source/condition_variable_native_win.h',
66 'source/cpu_info.cc', 62 'source/cpu_info.cc',
67 'source/cpu_features.cc', 63 'source/cpu_features.cc',
(...skipping 84 matching lines...) Expand 10 before | Expand all | Expand 10 after
152 #'WEBRTC_CLOCK_TYPE_REALTIME', 148 #'WEBRTC_CLOCK_TYPE_REALTIME',
153 ], 149 ],
154 'link_settings': { 150 'link_settings': {
155 'libraries': [ '-lrt', ], 151 'libraries': [ '-lrt', ],
156 }, 152 },
157 }], 153 }],
158 ['OS=="mac"', { 154 ['OS=="mac"', {
159 'link_settings': { 155 'link_settings': {
160 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/ApplicationServ ices.framework', ], 156 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/ApplicationServ ices.framework', ],
161 }, 157 },
162 'sources!': [
163 'source/atomic32_posix.cc',
164 ],
165 }], 158 }],
166 ['OS=="ios" or OS=="mac"', { 159 ['OS=="ios" or OS=="mac"', {
167 'defines': [ 160 'defines': [
168 'WEBRTC_THREAD_RR', 161 'WEBRTC_THREAD_RR',
169 'WEBRTC_CLOCK_TYPE_REALTIME', 162 'WEBRTC_CLOCK_TYPE_REALTIME',
170 ], 163 ],
171 }], 164 }],
172 ['OS=="win"', { 165 ['OS=="win"', {
173 'link_settings': { 166 'link_settings': {
174 'libraries': [ '-lwinmm.lib', ], 167 'libraries': [ '-lwinmm.lib', ],
175 }, 168 },
176 }], 169 }],
177 ], # conditions 170 ], # conditions
178 'target_conditions': [
179 # We need to do this in a target_conditions block to override the
180 # filename_rules filters.
181 ['OS=="ios"', {
182 # Pull in specific Mac files for iOS (which have been filtered out
183 # by file name rules).
184 'sources/': [
185 ['include', '^source/atomic32_mac\\.'],
186 ],
187 'sources!': [
188 'source/atomic32_posix.cc',
189 ],
190 }],
191 ],
192 # Disable warnings to enable Win64 build, issue 1323. 171 # Disable warnings to enable Win64 build, issue 1323.
193 'msvs_disabled_warnings': [ 172 'msvs_disabled_warnings': [
194 4267, # size_t to int truncation. 173 4267, # size_t to int truncation.
195 4334, # Ignore warning on shift operator promotion. 174 4334, # Ignore warning on shift operator promotion.
196 ], 175 ],
197 }, { 176 }, {
198 'target_name': 'field_trial_default', 177 'target_name': 'field_trial_default',
199 'type': 'static_library', 178 'type': 'static_library',
200 'sources': [ 179 'sources': [
201 'interface/field_trial_default.h', 180 'interface/field_trial_default.h',
(...skipping 15 matching lines...) Expand all
217 'target_name': 'system_wrappers_default', 196 'target_name': 'system_wrappers_default',
218 'type': 'static_library', 197 'type': 'static_library',
219 'dependencies': [ 198 'dependencies': [
220 'field_trial_default', 199 'field_trial_default',
221 'metrics_default', 200 'metrics_default',
222 ] 201 ]
223 }, 202 },
224 ], # targets 203 ], # targets
225 } 204 }
226 205
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698