From cf0b46c762171ffbb26a7387483fcb4d55918b0e Mon Sep 17 00:00:00 2001 From: "fischman@webrtc.org" Date: Mon, 14 Apr 2014 18:12:32 +0000 Subject: [PATCH] iosdeviceinfo.cc: remove unnecessary file 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 --- talk/libjingle.gyp | 1 - talk/media/devices/iosdeviceinfo.cc | 40 ----------------------------- 2 files changed, 41 deletions(-) delete mode 100644 talk/media/devices/iosdeviceinfo.cc diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp index 73c8a048f6..d61ac15205 100755 --- a/talk/libjingle.gyp +++ b/talk/libjingle.gyp @@ -962,7 +962,6 @@ }], ['OS=="ios"', { 'sources': [ - 'media/devices/iosdeviceinfo.cc', 'media/devices/mobiledevicemanager.cc', ], 'include_dirs': [ diff --git a/talk/media/devices/iosdeviceinfo.cc b/talk/media/devices/iosdeviceinfo.cc deleted file mode 100644 index 8b65c14283..0000000000 --- a/talk/media/devices/iosdeviceinfo.cc +++ /dev/null @@ -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