Move talk/examples/* to webrtc/examples.

webrtc/libjingle_examples.gyp

 #
-# 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.
 #  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': [
-    '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',
       ],
     },  # target relayserver
     {
       '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',
       ],
     },  # target stunserver
     {
       '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',
       ],
     },  # target turnserver
     {
       'target_name': 'peerconnection_server',
       'type': 'executable',
       'sources': [
         'examples/peerconnection/server/data_socket.cc',
         'examples/peerconnection/server/data_socket.h',
         'examples/peerconnection/server/main.cc',
         'examples/peerconnection/server/peer_channel.cc',
         'examples/peerconnection/server/peer_channel.h',
         'examples/peerconnection/server/utils.cc',
         'examples/peerconnection/server/utils.h',
       ],
       '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, ],
     }, # target peerconnection_server
   ],
   'conditions': [
     ['OS=="linux" or OS=="win"', {
       'targets': [
         {
           'target_name': 'peerconnection_client',
           'type': 'executable',
           'sources': [
             'examples/peerconnection/client/conductor.cc',
             'examples/peerconnection/client/conductor.h',
             'examples/peerconnection/client/defaults.cc',
             'examples/peerconnection/client/defaults.h',
             'examples/peerconnection/client/peer_connection_client.cc',
             'examples/peerconnection/client/peer_connection_client.h',
           ],
           'dependencies': [
-            'libjingle.gyp:libjingle_peerconnection',
+            '../talk/libjingle.gyp:libjingle_peerconnection',
             '<@(libjingle_tests_additional_deps)',
           ],
           'conditions': [
             ['build_json==1', {
               'dependencies': [
                 '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
               ],
             }],
             # TODO(ronghuawu): Move these files to a win/ directory then they
             # can be excluded automatically.
@@ skipping 64 matching lines @@
                 'MACOSX_DEPLOYMENT_TARGET' : '10.8',
               },
             }],
           ],
         },
         {
           'target_name': 'apprtc_signaling',
           'type': 'static_library',
           'dependencies': [
             'apprtc_common',
-            'libjingle.gyp:libjingle_peerconnection_objc',
+            '../talk/libjingle.gyp:libjingle_peerconnection_objc',
             'socketrocket',
           ],
           'sources': [
             'examples/objc/AppRTCDemo/ARDAppClient.h',
             'examples/objc/AppRTCDemo/ARDAppClient.m',
             'examples/objc/AppRTCDemo/ARDAppClient+Internal.h',
             'examples/objc/AppRTCDemo/ARDAppEngineClient.h',
             'examples/objc/AppRTCDemo/ARDAppEngineClient.m',
             'examples/objc/AppRTCDemo/ARDCEODTURNClient.h',
             'examples/objc/AppRTCDemo/ARDCEODTURNClient.m',
@@ skipping 23 matching lines @@
           ],
           'include_dirs': [
             'examples/objc/AppRTCDemo',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               'examples/objc/AppRTCDemo',
             ],
           },
           'export_dependent_settings': [
-            'libjingle.gyp:libjingle_peerconnection_objc',
+            '../talk/libjingle.gyp:libjingle_peerconnection_objc',
           ],
           'conditions': [
             ['OS=="mac"', {
               'xcode_settings': {
                 'MACOSX_DEPLOYMENT_TARGET' : '10.8',
               },
             }],
           ],
         },
         {
@@ skipping 110 matching lines @@
         },  # target socketrocket
       ],  # targets
     }],  # OS=="ios" or (OS=="mac" and target_arch!="ia32" and mac_sdk>="10.8")
 
     ['OS=="android"', {
       'targets': [
         {
           '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,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },  # target AppRTCDemo
 
         {
           # AppRTCDemo creates a .jar as a side effect. Any java targets
           # that need that .jar in their classpath should depend on this target,
@@ skipping 19 matching lines @@
             'apk_name': 'AppRTCDemoTest',
             'java_in_dir': 'examples/androidtests',
             'is_test_apk': 1,
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],  # targets
     }],  # OS=="android"
   ],
 }