Index: talk/build/merge_ios_libs.gyp |
diff --git a/talk/build/merge_ios_libs.gyp b/talk/build/merge_ios_libs.gyp |
deleted file mode 100644 |
index 83625ff7dbb89fdf8986fcd84b7e37855df9104a..0000000000000000000000000000000000000000 |
--- a/talk/build/merge_ios_libs.gyp |
+++ /dev/null |
@@ -1,53 +0,0 @@ |
-# |
-# libjingle |
-# Copyright 2015 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. |
- |
-{ |
- 'includes': ['common.gypi',], |
- 'conditions': [ |
- ['OS=="ios" or OS=="mac"', { |
- 'targets': [ |
- { |
- 'target_name': 'libjingle_peerconnection_objc_no_op', |
- 'includes': [ 'objc_app.gypi' ], |
- 'type': 'executable', |
- 'dependencies': [ |
- '../app/webrtc/legacy_objc_api.gyp:libjingle_peerconnection_objc', |
- ], |
- 'sources': ['<(webrtc_root)/build/no_op.cc',], |
- }, |
- { |
- 'target_name': 'webrtc_api_objc_no_op', |
- 'includes': [ 'objc_app.gypi' ], |
- 'type': 'executable', |
- 'dependencies': [ |
- '<(webrtc_root)/api/api.gyp:rtc_api_objc', |
- ], |
- 'sources': ['<(webrtc_root)/build/no_op.cc',], |
- }, |
- ], |
- }] |
- ], |
-} |