diff --git a/src/system_wrappers/source/Android.mk b/src/system_wrappers/source/Android.mk index 575580a497..aea9b320b9 100644 --- a/src/system_wrappers/source/Android.mk +++ b/src/system_wrappers/source/Android.mk @@ -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 # 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_SRC_FILES := \ map.cc \ - rw_lock_generic.cc \ sort.cc \ aligned_malloc.cc \ atomic32.cc \ diff --git a/src/system_wrappers/source/rw_lock.cc b/src/system_wrappers/source/rw_lock.cc index b308358d8a..16da0e321d 100644 --- a/src/system_wrappers/source/rw_lock.cc +++ b/src/system_wrappers/source/rw_lock.cc @@ -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 * that can be found in the LICENSE file in the root of the source @@ -14,9 +14,6 @@ #if defined(_WIN32) #include "rw_lock_win.h" -#elif defined(WEBRTC_ANDROID) - #include - #include "rw_lock_generic.h" #else #include "rw_lock_posix.h" #endif @@ -26,8 +23,6 @@ RWLockWrapper* RWLockWrapper::CreateRWLock() { #ifdef _WIN32 RWLockWrapper* lock = new RWLockWindows(); -#elif defined(WEBRTC_ANDROID) - RWLockWrapper* lock = new RWLockWrapperGeneric(); #else RWLockWrapper* lock = new RWLockPosix(); #endif