Index: webrtc/libjingle_examples.gyp |
diff --git a/talk/libjingle_examples.gyp b/webrtc/libjingle_examples.gyp |
similarity index 86% |
rename from talk/libjingle_examples.gyp |
rename to webrtc/libjingle_examples.gyp |
index cbd11d88ae39f549751ad4880c2316fa6d45b603..135932db62d6259bcd5132e90a32a6dcfe5e8287 100755 |
--- a/talk/libjingle_examples.gyp |
+++ b/webrtc/libjingle_examples.gyp |
@@ -1,40 +1,23 @@ |
# |
-# libjingle |
-# Copyright 2012 Google Inc. |
+# Copyright 2012 The WebRTC Project Authors. All rights reserved. |
# |
-# 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. |
+# 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 |
+# tree. An additional intellectual property rights grant can be found |
+# in the file PATENTS. All contributing project authors may |
+# be found in the AUTHORS file in the root of the source tree. |
{ |
'includes': [ |
- 'build/common.gypi', |
+ '../talk/build/common.gypi', |
], |
'targets': [ |
{ |
'target_name': 'relayserver', |
'type': 'executable', |
'dependencies': [ |
- 'libjingle.gyp:libjingle', |
- 'libjingle.gyp:libjingle_p2p', |
+ '../talk/libjingle.gyp:libjingle', |
+ '../talk/libjingle.gyp:libjingle_p2p', |
], |
'sources': [ |
'examples/relayserver/relayserver_main.cc', |
@@ -44,8 +27,8 @@ |
'target_name': 'stunserver', |
'type': 'executable', |
'dependencies': [ |
- 'libjingle.gyp:libjingle', |
- 'libjingle.gyp:libjingle_p2p', |
+ '../talk/libjingle.gyp:libjingle', |
+ '../talk/libjingle.gyp:libjingle_p2p', |
], |
'sources': [ |
'examples/stunserver/stunserver_main.cc', |
@@ -55,8 +38,8 @@ |
'target_name': 'turnserver', |
'type': 'executable', |
'dependencies': [ |
- 'libjingle.gyp:libjingle', |
- 'libjingle.gyp:libjingle_p2p', |
+ '../talk/libjingle.gyp:libjingle', |
+ '../talk/libjingle.gyp:libjingle_p2p', |
], |
'sources': [ |
'examples/turnserver/turnserver_main.cc', |
@@ -76,7 +59,7 @@ |
], |
'dependencies': [ |
'<(webrtc_root)/common.gyp:webrtc_common', |
- 'libjingle.gyp:libjingle', |
+ '../talk/libjingle.gyp:libjingle', |
], |
# TODO(ronghuawu): crbug.com/167187 fix size_t to int truncations. |
'msvs_disabled_warnings': [ 4309, ], |
@@ -97,7 +80,7 @@ |
'examples/peerconnection/client/peer_connection_client.h', |
], |
'dependencies': [ |
- 'libjingle.gyp:libjingle_peerconnection', |
+ '../talk/libjingle.gyp:libjingle_peerconnection', |
'<@(libjingle_tests_additional_deps)', |
], |
'conditions': [ |
@@ -156,7 +139,7 @@ |
'target_name': 'apprtc_common', |
'type': 'static_library', |
'dependencies': [ |
- 'libjingle.gyp:libjingle_peerconnection_objc', |
+ '../talk/libjingle.gyp:libjingle_peerconnection_objc', |
], |
'sources': [ |
'examples/objc/AppRTCDemo/common/ARDUtilities.h', |
@@ -183,7 +166,7 @@ |
'type': 'static_library', |
'dependencies': [ |
'apprtc_common', |
- 'libjingle.gyp:libjingle_peerconnection_objc', |
+ '../talk/libjingle.gyp:libjingle_peerconnection_objc', |
'socketrocket', |
], |
'sources': [ |
@@ -227,7 +210,7 @@ |
], |
}, |
'export_dependent_settings': [ |
- 'libjingle.gyp:libjingle_peerconnection_objc', |
+ '../talk/libjingle.gyp:libjingle_peerconnection_objc', |
], |
'conditions': [ |
['OS=="mac"', { |
@@ -358,20 +341,20 @@ |
'target_name': 'AppRTCDemo', |
'type': 'none', |
'dependencies': [ |
- 'libjingle.gyp:libjingle_peerconnection_java', |
+ '../talk/libjingle.gyp:libjingle_peerconnection_java', |
], |
'variables': { |
'apk_name': 'AppRTCDemo', |
- 'java_in_dir': 'examples/android', |
+ 'java_in_dir': 'examples/androidapp', |
'has_java_resources': 1, |
- 'resource_dir': 'examples/android/res', |
+ 'resource_dir': 'examples/androidapp/res', |
'R_package': 'org.appspot.apprtc', |
'R_package_relpath': 'org/appspot/apprtc', |
'input_jars_paths': [ |
- 'examples/android/third_party/autobanh/autobanh.jar', |
+ 'examples/androidapp/third_party/autobanh/autobanh.jar', |
], |
'library_dexed_jars_paths': [ |
- 'examples/android/third_party/autobanh/autobanh.jar', |
+ 'examples/androidapp/third_party/autobanh/autobanh.jar', |
], |
'native_lib_target': 'libjingle_peerconnection_so', |
'add_to_dependents_classpaths':1, |