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

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

Issue 1613013002: Remove non-monotonic clock support (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Cleanup Created 4 years, 10 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
« no previous file with comments | « webrtc/system_wrappers/source/tick_util.cc ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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', ],
(...skipping 80 matching lines...) Expand 10 before | Expand all | Expand 10 after
91 ], 91 ],
92 'conditions': [ 92 'conditions': [
93 ['enable_data_logging==1', { 93 ['enable_data_logging==1', {
94 'sources!': [ 'source/data_log_no_op.cc', ], 94 'sources!': [ 'source/data_log_no_op.cc', ],
95 }, { 95 }, {
96 'sources!': [ 'source/data_log.cc', ], 96 'sources!': [ 'source/data_log.cc', ],
97 },], 97 },],
98 ['OS=="android"', { 98 ['OS=="android"', {
99 'defines': [ 99 'defines': [
100 'WEBRTC_THREAD_RR', 100 'WEBRTC_THREAD_RR',
101 # TODO(leozwang): Investigate CLOCK_REALTIME and CLOCK_MONOTONIC
102 # support on Android. Keep WEBRTC_CLOCK_TYPE_REALTIME for now,
103 # remove it after I verify that CLOCK_MONOTONIC is fully functional
104 # with condition and event functions in system_wrappers.
105 'WEBRTC_CLOCK_TYPE_REALTIME',
106 ], 101 ],
107 'conditions': [ 102 'conditions': [
108 ['build_with_chromium==1', { 103 ['build_with_chromium==1', {
109 'dependencies': [ 104 'dependencies': [
110 'cpu_features_chromium.gyp:cpu_features_android', 105 'cpu_features_chromium.gyp:cpu_features_android',
111 ], 106 ],
112 }, { 107 }, {
113 'dependencies': [ 108 'dependencies': [
114 'cpu_features_webrtc.gyp:cpu_features_android', 109 'cpu_features_webrtc.gyp:cpu_features_android',
115 ], 110 ],
116 }], 111 }],
117 ], 112 ],
118 'link_settings': { 113 'link_settings': {
119 'libraries': [ 114 'libraries': [
120 '-llog', 115 '-llog',
121 ], 116 ],
122 }, 117 },
123 }, { # OS!="android" 118 }, { # OS!="android"
124 'sources!': [ 119 'sources!': [
125 'include/logcat_trace_context.h', 120 'include/logcat_trace_context.h',
126 'source/logcat_trace_context.cc', 121 'source/logcat_trace_context.cc',
127 ], 122 ],
128 }], 123 }],
129 ['OS=="linux"', { 124 ['OS=="linux"', {
130 'defines': [ 125 'defines': [
131 'WEBRTC_THREAD_RR', 126 'WEBRTC_THREAD_RR',
132 # TODO(andrew): can we select this automatically?
133 # Define this if the Linux system does not support CLOCK_MONOTONIC.
134 #'WEBRTC_CLOCK_TYPE_REALTIME',
135 ], 127 ],
136 'link_settings': { 128 'link_settings': {
137 'libraries': [ '-lrt', ], 129 'libraries': [ '-lrt', ],
138 }, 130 },
139 }], 131 }],
140 ['OS=="mac"', { 132 ['OS=="mac"', {
141 'link_settings': { 133 'link_settings': {
142 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/ApplicationServ ices.framework', ], 134 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/ApplicationServ ices.framework', ],
143 }, 135 },
144 'sources!': [ 136 'sources!': [
145 'source/atomic32_posix.cc', 137 'source/atomic32_posix.cc',
146 ], 138 ],
147 }], 139 }],
148 ['OS=="ios" or OS=="mac"', { 140 ['OS=="ios" or OS=="mac"', {
149 'defines': [ 141 'defines': [
150 'WEBRTC_THREAD_RR', 142 'WEBRTC_THREAD_RR',
151 'WEBRTC_CLOCK_TYPE_REALTIME',
152 ], 143 ],
153 }], 144 }],
154 ['OS=="win"', { 145 ['OS=="win"', {
155 'link_settings': { 146 'link_settings': {
156 'libraries': [ '-lwinmm.lib', ], 147 'libraries': [ '-lwinmm.lib', ],
157 }, 148 },
158 }], 149 }],
159 ], # conditions 150 ], # conditions
160 'target_conditions': [ 151 'target_conditions': [
161 # We need to do this in a target_conditions block to override the 152 # We need to do this in a target_conditions block to override the
(...skipping 32 matching lines...) Expand 10 before | Expand all | Expand 10 after
194 'type': 'static_library', 185 'type': 'static_library',
195 'dependencies': [ 186 'dependencies': [
196 'system_wrappers', 187 'system_wrappers',
197 'field_trial_default', 188 'field_trial_default',
198 'metrics_default', 189 'metrics_default',
199 ] 190 ]
200 }, 191 },
201 ], # targets 192 ], # targets
202 } 193 }
203 194
OLDNEW
« no previous file with comments | « webrtc/system_wrappers/source/tick_util.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698