Move talk/examples/* to webrtc/examples.

webrtc/libjingle_examples.gyp

Index: webrtc/libjingle_examples.gyp
diff --git a/talk/libjingle_examples.gyp b/webrtc/libjingle_examples.gyp
similarity index 92%
rename from talk/libjingle_examples.gyp
rename to webrtc/libjingle_examples.gyp
index 3401411314108600a57ee0866d79e13861438796..7906ff35c08aa3a8e85c78a14c4a39dd2b561221 100755
--- a/talk/libjingle_examples.gyp
+++ b/webrtc/libjingle_examples.gyp
@@ -1,12 +1,11 @@
 #
-# libjingle
-# Copyright 2012 Google Inc.
+# Copyright 2012 The WebRTC Project Authors. All rights reserved.

[tkchin_webrtc, 2015/07/22 21:08:21]

I don't think we're allowed to change copyright notices. Please check.

[Andrew MacDonald, 2015/07/22 22:06:49]

In any case, you definitely shouldn't mix license text like this.

I believe replacing the libjingle with webrtc license is fine, since Google
holds the copyright, but you could confirm with e.g. dannyb@.

[decurtis_webrtc, 2015/07/27 17:24:18]

Done.

 #
-# 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.
+# 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.
 #  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.
@@ -26,15 +25,15 @@
 
 {
   '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 +43,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 +54,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 +75,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 +96,7 @@
             'examples/peerconnection/client/peer_connection_client.h',
           ],
           'dependencies': [
-            'libjingle.gyp:libjingle_peerconnection',
+            '../talk/libjingle.gyp:libjingle_peerconnection',
             '<@(libjingle_tests_additional_deps)',
           ],
           'conditions': [
@@ -182,7 +181,7 @@
           'type': 'static_library',
           'dependencies': [
             'apprtc_common',
-            'libjingle.gyp:libjingle_peerconnection_objc',
+            '../talk/libjingle.gyp:libjingle_peerconnection_objc',
             'socketrocket',
           ],
           'sources': [
@@ -226,7 +225,7 @@
             ],
           },
           'export_dependent_settings': [
-            'libjingle.gyp:libjingle_peerconnection_objc',
+            '../talk/libjingle.gyp:libjingle_peerconnection_objc',
           ],
           'conditions': [
             ['OS=="mac"', {
@@ -357,20 +356,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,