Move talk/app/webrtc to webrtc/api

talk/libjingle.gyp

 #
 # 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.
 
 {
   'includes': ['build/common.gypi'],
   'conditions': [
-    ['os_posix == 1 and OS != "mac" and OS != "ios"', {
-     'conditions': [
-       ['sysroot!=""', {
-         'variables': {
-           'pkg-config': '../../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
-         },
-       }, {
-         'variables': {
-           'pkg-config': 'pkg-config'
-         },
-       }],
-     ],
-    }],
-    ['OS=="linux" or OS=="android"', {
-      'targets': [
-        {
-          'target_name': 'libjingle_peerconnection_jni',
-          'type': 'static_library',
-          'dependencies': [
-            '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
-            'libjingle_peerconnection',
-          ],
-          'sources': [
-            'app/webrtc/java/jni/classreferenceholder.cc',
-            'app/webrtc/java/jni/classreferenceholder.h',
-            'app/webrtc/java/jni/jni_helpers.cc',
-            'app/webrtc/java/jni/jni_helpers.h',
-            'app/webrtc/java/jni/native_handle_impl.cc',
-            'app/webrtc/java/jni/native_handle_impl.h',
-            'app/webrtc/java/jni/peerconnection_jni.cc',
-          ],
-          'include_dirs': [
-            '<(libyuv_dir)/include',
-          ],
-          'conditions': [
-            ['OS=="linux"', {
-              'include_dirs': [
-                '<(java_home)/include',
-                '<(java_home)/include/linux',
-              ],
-            }],
-           ['build_json==1', {
-              'dependencies': [
-                '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
-              ],
-              'export_dependent_settings': [
-                '<(DEPTH)/third_party/jsoncpp/jsoncpp.gyp:jsoncpp',
-              ],
-            }],
-            ['OS=="android"', {
-              'sources': [
-                'app/webrtc/androidvideocapturer.cc',
-                'app/webrtc/androidvideocapturer.h',
-                'app/webrtc/java/jni/androidmediacodeccommon.h',
-                'app/webrtc/java/jni/androidmediadecoder_jni.cc',
-                'app/webrtc/java/jni/androidmediadecoder_jni.h',
-                'app/webrtc/java/jni/androidmediaencoder_jni.cc',
-                'app/webrtc/java/jni/androidmediaencoder_jni.h',
-                'app/webrtc/java/jni/androidnetworkmonitor_jni.cc',
-                'app/webrtc/java/jni/androidnetworkmonitor_jni.h',
-                'app/webrtc/java/jni/androidvideocapturer_jni.cc',
-                'app/webrtc/java/jni/androidvideocapturer_jni.h',
-                'app/webrtc/java/jni/surfacetexturehelper_jni.cc',
-                'app/webrtc/java/jni/surfacetexturehelper_jni.h',
-              ]
-            }],
-          ],
-        },
-        {
-          'target_name': 'libjingle_peerconnection_so',
-          'type': 'shared_library',
-          'dependencies': [
-            'libjingle_peerconnection',
-            'libjingle_peerconnection_jni',
-          ],
-          'sources': [
-           'app/webrtc/java/jni/jni_onload.cc',
-          ],
-          'variables': {
-            # This library uses native JNI exports; tell GYP so that the
-            # required symbols will be kept.
-            'use_native_jni_exports': 1,
-          },
-          'conditions': [
-            ['OS=="linux"', {
-              'defines': [
-                'HAVE_GTK',
-              ],
-              'include_dirs': [
-                '<(java_home)/include',
-                '<(java_home)/include/linux',
-              ],
-              'conditions': [
-                ['use_gtk==1', {
-                  'link_settings': {
-                    'libraries': [
-                      '<!@(pkg-config --libs-only-l gobject-2.0 gthread-2.0'
-                          ' gtk+-2.0)',
-                    ],
-                  },
-                }],
-              ],
-            }],
-          ],
-        },
-        {
-          'target_name': 'libjingle_peerconnection_jar',
-          'type': 'none',
-          'actions': [
-            {
-              # TODO(jiayl): extract peerconnection_java_files and android_java_files into a webrtc
-              # gyp var that can be included here, or better yet, build a proper .jar in webrtc
-              # and include it here.
-              'variables': {
-                'java_src_dir': 'app/webrtc/java/src',
-                'webrtc_base_dir': '<(webrtc_root)/base',
-                'webrtc_modules_dir': '<(webrtc_root)/modules',
-                'build_jar_log': '<(INTERMEDIATE_DIR)/build_jar.log',
-                'peerconnection_java_files': [
-                  'app/webrtc/java/src/org/webrtc/AudioSource.java',
-                  'app/webrtc/java/src/org/webrtc/AudioTrack.java',
-                  'app/webrtc/java/src/org/webrtc/CallSessionFileRotatingLogSink.java',
-                  'app/webrtc/java/src/org/webrtc/DataChannel.java',
-                  'app/webrtc/java/src/org/webrtc/IceCandidate.java',
-                  'app/webrtc/java/src/org/webrtc/MediaConstraints.java',
-                  'app/webrtc/java/src/org/webrtc/MediaSource.java',
-                  'app/webrtc/java/src/org/webrtc/MediaStream.java',
-                  'app/webrtc/java/src/org/webrtc/MediaStreamTrack.java',
-                  'app/webrtc/java/src/org/webrtc/PeerConnectionFactory.java',
-                  'app/webrtc/java/src/org/webrtc/PeerConnection.java',
-                  'app/webrtc/java/src/org/webrtc/RtpReceiver.java',
-                  'app/webrtc/java/src/org/webrtc/RtpSender.java',
-                  'app/webrtc/java/src/org/webrtc/SdpObserver.java',
-                  'app/webrtc/java/src/org/webrtc/StatsObserver.java',
-                  'app/webrtc/java/src/org/webrtc/StatsReport.java',
-                  'app/webrtc/java/src/org/webrtc/SessionDescription.java',
-                  'app/webrtc/java/src/org/webrtc/VideoCapturer.java',
-                  'app/webrtc/java/src/org/webrtc/VideoRenderer.java',
-                  'app/webrtc/java/src/org/webrtc/VideoSource.java',
-                  'app/webrtc/java/src/org/webrtc/VideoTrack.java',
-                  '<(webrtc_base_dir)/java/src/org/webrtc/Logging.java',
-                ],
-                'android_java_files': [
-                  'app/webrtc/java/android/org/webrtc/Camera2Enumerator.java',
-                  'app/webrtc/java/android/org/webrtc/CameraEnumerationAndroid.java',
-                  'app/webrtc/java/android/org/webrtc/CameraEnumerator.java',
-                  'app/webrtc/java/android/org/webrtc/EglBase.java',
-                  'app/webrtc/java/android/org/webrtc/EglBase10.java',
-                  'app/webrtc/java/android/org/webrtc/EglBase14.java',
-                  'app/webrtc/java/android/org/webrtc/GlRectDrawer.java',
-                  'app/webrtc/java/android/org/webrtc/GlShader.java',
-                  'app/webrtc/java/android/org/webrtc/GlUtil.java',
-                  'app/webrtc/java/android/org/webrtc/GlTextureFrameBuffer.java',
-                  'app/webrtc/java/android/org/webrtc/NetworkMonitor.java',
-                  'app/webrtc/java/android/org/webrtc/NetworkMonitorAutoDetect.java',
-                  'app/webrtc/java/android/org/webrtc/RendererCommon.java',
-                  'app/webrtc/java/android/org/webrtc/SurfaceTextureHelper.java',
-                  'app/webrtc/java/android/org/webrtc/SurfaceViewRenderer.java',
-                  'app/webrtc/java/android/org/webrtc/ThreadUtils.java',
-                  'app/webrtc/java/android/org/webrtc/VideoCapturerAndroid.java',
-                  'app/webrtc/java/android/org/webrtc/VideoRendererGui.java',
-                  'app/webrtc/java/src/org/webrtc/MediaCodecVideoDecoder.java',
-                  'app/webrtc/java/src/org/webrtc/MediaCodecVideoEncoder.java',
-                  '<(webrtc_modules_dir)/video_render/android/java/src/org/webrtc/videoengine/ViEAndroidGLES20.java',
-                  '<(webrtc_modules_dir)/video_render/android/java/src/org/webrtc/videoengine/ViERenderer.java',
-                  '<(webrtc_modules_dir)/video_render/android/java/src/org/webrtc/videoengine/ViESurfaceRenderer.java',
-                  '<(webrtc_modules_dir)/audio_device/android/java/src/org/webrtc/voiceengine/BuildInfo.java',
-                  '<(webrtc_modules_dir)/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioEffects.java',
-                  '<(webrtc_modules_dir)/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioManager.java',
-                  '<(webrtc_modules_dir)/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioUtils.java',
-                  '<(webrtc_modules_dir)/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioRecord.java',
-                  '<(webrtc_modules_dir)/audio_device/android/java/src/org/webrtc/voiceengine/WebRtcAudioTrack.java',
-                ],
-              },
-              'action_name': 'create_jar',
-              'inputs': [
-                'build/build_jar.sh',
-                '<@(java_files)',
-              ],
-              'outputs': [
-                '<(PRODUCT_DIR)/libjingle_peerconnection.jar',
-              ],
-              'conditions': [
-                ['OS=="android"', {
-                  'variables': {
-                    'java_files': ['<@(peerconnection_java_files)', '<@(android_java_files)'],
-                    'build_classpath': '<(java_src_dir):<(DEPTH)/third_party/android_tools/sdk/platforms/android-<(android_sdk_version)/android.jar',
-                  },
-                }, {
-                  'variables': {
-                    'java_files': ['<@(peerconnection_java_files)'],
-                    'build_classpath': '<(java_src_dir)',
-                  },
-                }],
-              ],
-              'action': [
-                'bash', '-ec',
-                'mkdir -p <(INTERMEDIATE_DIR) && '
-                '{ build/build_jar.sh <(java_home) <@(_outputs) '
-                '      <(INTERMEDIATE_DIR)/build_jar.tmp '
-                '      <(build_classpath) <@(java_files) '
-                '      > <(build_jar_log) 2>&1 || '
-                '  { cat <(build_jar_log) ; exit 1; } }'
-              ],
-            },
-          ],
-          'dependencies': [
-            'libjingle_peerconnection_so',
-          ],
-        },
-      ],
-    }],
-    ['OS=="android"', {
-      'targets': [
-        {
-          # |libjingle_peerconnection_java| builds a jar file with name
-          # libjingle_peerconnection_java.jar using Chromes build system.
-          # It includes all Java files needed to setup a PeeerConnection call
-          # from Android.
-          # TODO(perkj): Consider replacing the use of
-          # libjingle_peerconnection_jar with this target everywhere.
-          'target_name': 'libjingle_peerconnection_java',
-          'type': 'none',
-          'dependencies': [
-            'libjingle_peerconnection_so',
-          ],
-          'variables': {
-            # Designate as Chromium code and point to our lint settings to
-            # enable linting of the WebRTC code (this is the only way to make
-            # lint_action invoke the Android linter).
-            'android_manifest_path': '<(webrtc_root)/build/android/AndroidManifest.xml',
-            'suppressions_file': '<(webrtc_root)/build/android/suppressions.xml',
-            'chromium_code': 1,
-            'java_in_dir': 'app/webrtc/java',
-            'webrtc_base_dir': '<(webrtc_root)/base',
-            'webrtc_modules_dir': '<(webrtc_root)/modules',
-            'additional_src_dirs' : [
-              'app/webrtc/java/android',
-              '<(webrtc_base_dir)/java/src',
-              '<(webrtc_modules_dir)/audio_device/android/java/src',
-              '<(webrtc_modules_dir)/video_render/android/java/src',
-            ],
-          },
-          'includes': ['../build/java.gypi'],
-        }, # libjingle_peerconnection_java
-      ]
-    }],
     ['OS=="ios" or (OS=="mac" and target_arch!="ia32")', {
       # The >= 10.7 above is required for ARC.

[pthatcher1, 2016/02/05 21:18:49]

Shouldn't we (re)move this target also?  I thought the files are being moved.

[kjellander_webrtc, 2016/02/08 09:12:06]

No, Zeke wanted to let the ObjC files stay, since there's already a new ObjC API
built in webrtc/api. See
https://bugs.chromium.org/p/webrtc/issues/detail?id=5418#c2

       'targets': [
         {
           'target_name': 'libjingle_peerconnection_objc',
           'type': 'static_library',
           'dependencies': [
-            'libjingle_peerconnection',
+            '<(webrtc_root)/api/api.gyp:libjingle_peerconnection',
           ],
           'sources': [
             'app/webrtc/objc/RTCAudioTrack+Internal.h',
             'app/webrtc/objc/RTCAudioTrack.mm',
             'app/webrtc/objc/RTCDataChannel+Internal.h',
             'app/webrtc/objc/RTCDataChannel.mm',
             'app/webrtc/objc/RTCEnumConverter.h',
             'app/webrtc/objc/RTCEnumConverter.mm',
             'app/webrtc/objc/RTCFileLogger.mm',
             'app/webrtc/objc/RTCI420Frame+Internal.h',
@@ skipping 61 matching lines @@
             'app/webrtc/objc/public/RTCVideoRenderer.h',
             'app/webrtc/objc/public/RTCVideoSource.h',
             'app/webrtc/objc/public/RTCVideoTrack.h',
           ],
           'direct_dependent_settings': {
             'include_dirs': [
               '<(DEPTH)/talk/app/webrtc/objc/public',
             ],
           },
           'include_dirs': [
-            '<(DEPTH)/talk/app/webrtc',
+            '<(webrtc_root)/webrtc/api',
             '<(DEPTH)/talk/app/webrtc/objc',
             '<(DEPTH)/talk/app/webrtc/objc/public',
           ],
           'link_settings': {
             'libraries': [
               '-lstdc++',
             ],
           },
           'all_dependent_settings': {
             'xcode_settings': {
@@ skipping 51 matching lines @@
                     '-framework Cocoa',
                   ],
                 },
               },
             }],
           ],
         },  # target libjingle_peerconnection_objc
       ],
     }],
   ],
-
   'targets': [
     {
       'target_name': 'libjingle',
       'type': 'none',
       'dependencies': [
         '<(webrtc_root)/base/base.gyp:rtc_base',
       ],
       'conditions': [
         ['build_json==1', {
           'dependencies': [
@@ skipping 292 matching lines @@
         'session/media/mediasession.cc',
         'session/media/mediasession.h',
         'session/media/mediasink.h',
         'session/media/rtcpmuxfilter.cc',
         'session/media/rtcpmuxfilter.h',
         'session/media/srtpfilter.cc',
         'session/media/srtpfilter.h',
         'session/media/voicechannel.h',
       ],
     },  # target libjingle_p2p
-    {
-      'target_name': 'libjingle_peerconnection',
-      'type': 'static_library',
-      'dependencies': [
-        'libjingle',
-        'libjingle_media',
-        'libjingle_p2p',
-      ],
-      'sources': [
-        'app/webrtc/audiotrack.cc',
-        'app/webrtc/audiotrack.h',
-        'app/webrtc/datachannel.cc',
-        'app/webrtc/datachannel.h',
-        'app/webrtc/datachannelinterface.h',
-        'app/webrtc/dtlsidentitystore.cc',
-        'app/webrtc/dtlsidentitystore.h',
-        'app/webrtc/dtmfsender.cc',
-        'app/webrtc/dtmfsender.h',
-        'app/webrtc/dtmfsenderinterface.h',
-        'app/webrtc/jsep.h',
-        'app/webrtc/jsepicecandidate.cc',
-        'app/webrtc/jsepicecandidate.h',
-        'app/webrtc/jsepsessiondescription.cc',
-        'app/webrtc/jsepsessiondescription.h',
-        'app/webrtc/localaudiosource.cc',
-        'app/webrtc/localaudiosource.h',
-        'app/webrtc/mediaconstraintsinterface.cc',
-        'app/webrtc/mediaconstraintsinterface.h',
-        'app/webrtc/mediacontroller.cc',
-        'app/webrtc/mediacontroller.h',
-        'app/webrtc/mediastream.cc',
-        'app/webrtc/mediastream.h',
-        'app/webrtc/mediastreaminterface.h',
-        'app/webrtc/mediastreamobserver.cc',
-        'app/webrtc/mediastreamobserver.h',
-        'app/webrtc/mediastreamprovider.h',
-        'app/webrtc/mediastreamproxy.h',
-        'app/webrtc/mediastreamtrack.h',
-        'app/webrtc/mediastreamtrackproxy.h',
-        'app/webrtc/notifier.h',
-        'app/webrtc/peerconnection.cc',
-        'app/webrtc/peerconnection.h',
-        'app/webrtc/peerconnectionfactory.cc',
-        'app/webrtc/peerconnectionfactory.h',
-        'app/webrtc/peerconnectionfactoryproxy.h',
-        'app/webrtc/peerconnectioninterface.h',
-        'app/webrtc/peerconnectionproxy.h',
-        'app/webrtc/proxy.h',
-        'app/webrtc/remoteaudiosource.cc',
-        'app/webrtc/remoteaudiosource.h',
-        'app/webrtc/remotevideocapturer.cc',
-        'app/webrtc/remotevideocapturer.h',
-        'app/webrtc/rtpreceiver.cc',
-        'app/webrtc/rtpreceiver.h',
-        'app/webrtc/rtpreceiverinterface.h',
-        'app/webrtc/rtpsender.cc',
-        'app/webrtc/rtpsender.h',
-        'app/webrtc/rtpsenderinterface.h',
-        'app/webrtc/sctputils.cc',
-        'app/webrtc/sctputils.h',
-        'app/webrtc/statscollector.cc',
-        'app/webrtc/statscollector.h',
-        'app/webrtc/statstypes.cc',
-        'app/webrtc/statstypes.h',
-        'app/webrtc/streamcollection.h',
-        'app/webrtc/videosource.cc',
-        'app/webrtc/videosource.h',
-        'app/webrtc/videosourceinterface.h',
-        'app/webrtc/videosourceproxy.h',
-        'app/webrtc/videotrack.cc',
-        'app/webrtc/videotrack.h',
-        'app/webrtc/videotrackrenderers.cc',
-        'app/webrtc/videotrackrenderers.h',
-        'app/webrtc/webrtcsdp.cc',
-        'app/webrtc/webrtcsdp.h',
-        'app/webrtc/webrtcsession.cc',
-        'app/webrtc/webrtcsession.h',
-        'app/webrtc/webrtcsessiondescriptionfactory.cc',
-        'app/webrtc/webrtcsessiondescriptionfactory.h',
-      ],
-    },  # target libjingle_peerconnection
   ],
 }