generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move WEBRTC_THREAD_RR and WEBRTC_CLOCK_TYPE_REALTIME to system_wrappers.gypi .

Browse Source 
WEBRTC_THREAD_RR and WEBRTC_CLOCK_TYPE_REALTIME are used only in code compiled
in system_wrappers, so they don't need to be in common.gypi.

R=andrew@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/1368005

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3926 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
sergeyu@chromium.org 2013-04-30 22:53:51 +00:00
parent 72d0b0cf1f
commit 23516638fa
2 changed files with 20 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
webrtc/build/common.gypi
View File

@ -259,24 +259,16 @@
'defines': [
'WEBRTC_MAC',
'WEBRTC_IOS',
'WEBRTC_THREAD_RR',
'WEBRTC_CLOCK_TYPE_REALTIME',
],
}],
['OS=="linux"', {
'defines': [
'WEBRTC_LINUX',
'WEBRTC_THREAD_RR',
# TODO(andrew): can we select this automatically?
# Define this if the Linux system does not support CLOCK_MONOTONIC.
#'WEBRTC_CLOCK_TYPE_REALTIME',
],
}],
['OS=="mac"', {
'defines': [
'WEBRTC_MAC',
'WEBRTC_THREAD_RR',
'WEBRTC_CLOCK_TYPE_REALTIME',
],
}],
['OS=="win"', {
@ -297,12 +289,6 @@
'defines': [
'WEBRTC_LINUX',
'WEBRTC_ANDROID',
# TODO(leozwang): Investigate CLOCK_REALTIME and CLOCK_MONOTONIC
# support on Android. Keep WEBRTC_CLOCK_TYPE_REALTIME for now,
# remove it after I verify that CLOCK_MONOTONIC is fully functional
# with condition and event functions in system_wrappers.
'WEBRTC_CLOCK_TYPE_REALTIME',
'WEBRTC_THREAD_RR',
],
'conditions': [
['enable_android_opensl==1', {

20
webrtc/system_wrappers/source/system_wrappers.gyp
View File

@ -133,9 +133,23 @@
],
}],
['OS=="android"', {
'defines': [
'WEBRTC_THREAD_RR',
# TODO(leozwang): Investigate CLOCK_REALTIME and CLOCK_MONOTONIC
# support on Android. Keep WEBRTC_CLOCK_TYPE_REALTIME for now,
# remove it after I verify that CLOCK_MONOTONIC is fully functional
# with condition and event functions in system_wrappers.
'WEBRTC_CLOCK_TYPE_REALTIME',
],
'dependencies': [ 'cpu_features_android', ],
}],
['OS=="linux"', {
'defines': [
'WEBRTC_THREAD_RR',
# TODO(andrew): can we select this automatically?
# Define this if the Linux system does not support CLOCK_MONOTONIC.
#'WEBRTC_CLOCK_TYPE_REALTIME',
],
'link_settings': {
'libraries': [ '-lrt', ],
},
@ -148,6 +162,12 @@
'atomic32_posix.cc',
],
}],
['OS=="ios" or OS=="mac"', {
'defines': [
'WEBRTC_THREAD_RR',
'WEBRTC_CLOCK_TYPE_REALTIME',
],
}],
['OS=="win"', {
'link_settings': {
'libraries': [ '-lwinmm.lib', ],