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

iosdeviceinfo.cc: remove unnecessary file

Browse Source 
The do-nothing implementation in this file is already present in
mobiledevicemanager.cc (shared with Android) so this isn't adding value, and
causes duplicate-symbol errors under some compilers.

BUG=3201
R=henrike@webrtc.org

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

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5899 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
fischman@webrtc.org 2014-04-14 18:12:32 +00:00
parent 5cf73962e6
commit cf0b46c762
2 changed files with 0 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
talk/libjingle.gyp
View File

@ -962,7 +962,6 @@
}],
['OS=="ios"', {
'sources': [
'media/devices/iosdeviceinfo.cc',
'media/devices/mobiledevicemanager.cc',
],
'include_dirs': [

40
talk/media/devices/iosdeviceinfo.cc
View File

@ -1,40 +0,0 @@
/*
* libjingle
* Copyright 2012 Google Inc.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions are met:
*
* 1. Redistributions of source code must retain the above copyright notice,
* this list of conditions and the following disclaimer.
* 2. Redistributions in binary form must reproduce the above copyright notice,
* this list of conditions and the following disclaimer in the documentation
* and/or other materials provided with the distribution.
* 3. The name of the author may not be used to endorse or promote products
* derived from this software without specific prior written permission.
*
* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
* MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
* EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO,
* PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS;
* OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
* WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR
* OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
* ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
#include "talk/media/devices/deviceinfo.h"
namespace cricket {
bool GetUsbId(const Device& device, std::string* usb_id) {
return false;
}
bool GetUsbVersion(const Device& device, std::string* usb_version) {
return false;
}
} // namespace cricket