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

Enable rw_lock_posix on andorid

Browse Source 
Review URL: https://webrtc-codereview.appspot.com/404002

git-svn-id: http://webrtc.googlecode.com/svn/trunk@1789 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@webrtc.org 2012-02-28 23:10:03 +00:00
parent 547c157a49
commit 785db5a2a5
2 changed files with 2 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/system_wrappers/source/Android.mk
View File

@ -1,4 +1,4 @@
# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. # Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
# #
# Use of this source code is governed by a BSD-style license # Use of this source code is governed by a BSD-style license
# that can be found in the LICENSE file in the root of the source # that can be found in the LICENSE file in the root of the source
@ -18,7 +18,6 @@ LOCAL_MODULE_TAGS := optional
LOCAL_CPP_EXTENSION := .cc LOCAL_CPP_EXTENSION := .cc
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
map.cc \ map.cc \
rw_lock_generic.cc \
sort.cc \ sort.cc \
aligned_malloc.cc \ aligned_malloc.cc \
atomic32.cc \ atomic32.cc \

7
src/system_wrappers/source/rw_lock.cc
View File

@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2011 The WebRTC project authors. All Rights Reserved. * Copyright (c) 2012 The WebRTC project authors. All Rights Reserved.
* *
* Use of this source code is governed by a BSD-style license * Use of this source code is governed by a BSD-style license
* that can be found in the LICENSE file in the root of the source * that can be found in the LICENSE file in the root of the source
@ -14,9 +14,6 @@
#if defined(_WIN32) #if defined(_WIN32)
#include "rw_lock_win.h" #include "rw_lock_win.h"
#elif defined(WEBRTC_ANDROID)
#include <stdlib.h>
#include "rw_lock_generic.h"
#else #else
#include "rw_lock_posix.h" #include "rw_lock_posix.h"
#endif #endif
@ -26,8 +23,6 @@ RWLockWrapper* RWLockWrapper::CreateRWLock()
{ {
#ifdef _WIN32 #ifdef _WIN32
RWLockWrapper* lock = new RWLockWindows(); RWLockWrapper* lock = new RWLockWindows();
#elif defined(WEBRTC_ANDROID)
RWLockWrapper* lock = new RWLockWrapperGeneric();
#else #else
RWLockWrapper* lock = new RWLockPosix(); RWLockWrapper* lock = new RWLockPosix();
#endif #endif