Remove Java PC support.

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,
@@ skipping 22 matching lines @@
          'variables': {
            'pkg-config': '../../../build/linux/pkg-config-wrapper "<(sysroot)" "<(target_arch)"',
          },
        }, {
          'variables': {
            'pkg-config': 'pkg-config'
          },
        }],
      ],
     }],
-    ['OS=="linux" or OS=="android"', {
+    ['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/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/classreferenceholder.cc',
             'app/webrtc/java/jni/classreferenceholder.h',
+            'app/webrtc/java/jni/eglbase_jni.cc',
+            'app/webrtc/java/jni/eglbase_jni.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',
+            'app/webrtc/java/jni/surfacetexturehelper_jni.cc',
+            'app/webrtc/java/jni/surfacetexturehelper_jni.h',
           ],
           'include_dirs': [
             '<(libyuv_dir)/include',
           ],
           'conditions': [
             ['OS=="linux"', {

[kjellander_webrtc, 2016/02/02 08:24:40]

I assume this can be dropped now?

[perkj_webrtc, 2016/02/03 17:00:03]

Done.

               '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"', {

[kjellander_webrtc, 2016/02/02 08:24:40]

Remove this empty section.

[perkj_webrtc, 2016/02/03 17:00:03]

Done.

               '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/eglbase_jni.cc',
-                'app/webrtc/java/jni/eglbase_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',
@@ skipping 564 matching lines @@
         '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
   ],
 }