zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix androidndk build take two.

Browse Source 
TBR=xians

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2069 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
tommi@webrtc.org
2012-04-19 15:38:10 +00:00
parent 3db5cb7438
commit 9018c9f548
2 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

0
src/system_wrappers/source/atomic32_linux.cc → src/system_wrappers/source/atomic32_posix.cc
View File

10
src/system_wrappers/source/system_wrappers.gyp
View File

@ -48,8 +48,8 @@
'../interface/tick_util.h', '../interface/tick_util.h',
'../interface/trace.h', '../interface/trace.h',
'aligned_malloc.cc', 'aligned_malloc.cc',
'atomic32_linux.cc',
'atomic32_mac.cc', 'atomic32_mac.cc',
'atomic32_posix.cc',
'atomic32_win.cc', 'atomic32_win.cc',
'condition_variable.cc', 'condition_variable.cc',
'condition_variable_posix.cc', 'condition_variable_posix.cc',
@ -109,11 +109,6 @@
},{ },{
'sources!': [ 'data_log.cc', ], 'sources!': [ 'data_log.cc', ],
},], },],
['OS=="android"', {
'sources': [
'atomic32_linux.cc',
]
}], # OS==android
['OS=="linux"', { ['OS=="linux"', {
'link_settings': { 'link_settings': {
'libraries': [ '-lrt', ], 'libraries': [ '-lrt', ],
@ -123,6 +118,9 @@
'link_settings': { 'link_settings': {
'libraries': [ '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework', ], 'libraries': [ '$(SDKROOT)/System/Library/Frameworks/ApplicationServices.framework', ],
}, },
'sources!': [
'atomic32_posix.cc',
],
}], }],
['OS=="win"', { ['OS=="win"', {
'link_settings': { 'link_settings': {