Making WebRTC Java api avaliable in Chromium.

third_party/libjingle/libjingle.gyp

Index: third_party/libjingle/libjingle.gyp
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 3170804d78b649a883246864434b00ee22c2cb63..8c384a4bfe56db2af3a4425ff5ff992f73613128 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -598,24 +598,7 @@
           # GN version: //third_party/libjingle:libpeerconnection
           'target_name': 'libpeerconnection',
           'type': '<(libpeer_target_type)',
-          'sources': [
-            # Note: sources list duplicated in GN build.
-            '<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.cc',
-            '<(libjingle_source)/talk/media/webrtc/webrtcmediaengine.h',
-            '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.cc',
-            '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine.h',
-            '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine2.cc',
-            '<(libjingle_source)/talk/media/webrtc/webrtcvideoengine2.h',
-            '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.cc',
-            '<(libjingle_source)/talk/media/webrtc/webrtcvoiceengine.h',
-          ],
-          'dependencies': [
-            '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
-            '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine',
-            '<(DEPTH)/third_party/webrtc/webrtc.gyp:webrtc',
-            '<@(libjingle_peerconnection_additional_deps)',
-            'libjingle_webrtc_common',
-          ],
+          'includes': [ 'libjingle_peerconnection.gypi' ],
           'conditions': [
             ['libpeer_target_type!="static_library"', {
               'sources': [
@@ -667,5 +650,40 @@
         },  # target libpeerconnection
       ],
     }],
+    ['enable_webrtc==1 and OS=="android"', {
+      'targets': [
+        {
+          # GN version: //third_party/libjingle:libjingle_peerconnection_so
+          'target_name': 'libjingle_peerconnection_so',
+          'type': 'loadable_module',
+          'dependencies': [
+            'libjingle_webrtc_common',

[hellner1, 2014/09/29 18:21:05]

Do you need "init_webrtc.cc/h" if you instead depend on libjingle_webrtc?

[SeRya, 2014/09/30 18:29:01]

Reason for this was webrtc::field_trial::FindFullName referenced in 2-3 files.
But it seems like dependence on system_wrappers.gyp:field_trial_default is
better way to satisfy that need. Fixed.

+            '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
+          ],
+          'includes': [ 'libjingle_peerconnection.gypi' ],
+          'defines': [ 'LIBPEERCONNECTION_LIB=1' ],
+          'sources': [
+            '<(libjingle_source)/talk/app/webrtc/java/jni/peerconnection_jni.cc',
+            'overrides/init_webrtc.cc',
+            'overrides/init_webrtc.h',
+          ],
+          'include_dirs': [
+            '<(DEPTH)/third_party/libyuv/include',
+          ],
+        },
+        {
+          # GN version: //third_party/libjingle:libjingle_peerconnection_java
+          'target_name': 'libjingle_peerconnection_javalib',
+          'type': 'none',
+          'variables': {
+            'java_in_dir': '<(libjingle_source)/talk/app/webrtc/java',
+          },
+          'dependencies': [
+            'libjingle_peerconnection_so',
+          ],
+          'includes': [ '../../build/java.gypi' ],

[hellner1, 2014/09/29 18:21:05]

This might make it harder get rid of this duplicate gyp-file (see other one
here: https://code.google.com/p/webrtc/source/browse/trunk/talk/libjingle.gyp)
as build/java.gypi might be in a different relative directory in the standalone
build.

[SeRya, 2014/09/30 18:29:01]

Do you have an idea how to make it easier? It seems '<(DEPTH)/build/java.gypi'
doesn't work.

+        },
+      ],
+    }],
   ],
 }