Add APK targets to build libjingle tests for Android.

talk/libjingle.gyp

Index: talk/libjingle.gyp
diff --git a/talk/libjingle.gyp b/talk/libjingle.gyp
index f1ce18d96a4c309e8933113124f4419e64606c58..c6770c672b630253e9ea3f9baf3e23278f7a3b24 100755
--- a/talk/libjingle.gyp
+++ b/talk/libjingle.gyp
@@ -43,8 +43,8 @@
     ['OS=="linux" or OS=="android"', {
       'targets': [
         {
-          'target_name': 'libjingle_peerconnection_so',
-          'type': 'shared_library',
+          'target_name': 'libjingle_peerconnection_jni',
+          'type': 'static_library',
           'dependencies': [
             '<(webrtc_root)/system_wrappers/system_wrappers.gyp:field_trial_default',
             'libjingle_peerconnection',
@@ -63,34 +63,26 @@
           ],
           '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)',
-                    ],
-                  },
-                }],
+            }],
+           ['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',

[kjellander_webrtc, 2015/12/14 04:37:50]

Now these will be built when building in Chromium (build_with_chromium==1). Will
that work?

[perkj_webrtc, 2015/12/14 07:22:21]

I think we should just remove the build_with_chromium==0 below, combine these
and give it a try. I don't' see why but on the other hand, nothing of the java
or jni things should ever be used in chrome.

[kjellander_webrtc, 2015/12/14 08:50:43]

Fair enough, since Chromium uses it's own GYP file for libjingle.
But isn't that something we want to move away from?
Either way, I guess that will still require a bunch of change sin our own GYP
files, so let's keep that out of this CL.

+                'app/webrtc/androidvideocapturer.h',
                 'app/webrtc/java/jni/androidvideocapturer_jni.cc',
                 'app/webrtc/java/jni/androidvideocapturer_jni.h',
               ],
-              'variables': {
-                # This library uses native JNI exports; tell GYP so that the
-                # required symbols will be kept.
-                'use_native_jni_exports': 1,
-              },
             }],
             ['OS=="android" and build_with_chromium==0', {
               'sources': [
@@ -108,6 +100,43 @@
           ],
         },
         {
+          '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': [
@@ -794,14 +823,6 @@
         'app/webrtc/webrtcsessiondescriptionfactory.cc',
         'app/webrtc/webrtcsessiondescriptionfactory.h',
       ],
-      'conditions': [
-        ['OS=="android" and build_with_chromium==0', {
-          'sources': [
-            'app/webrtc/androidvideocapturer.h',
-            'app/webrtc/androidvideocapturer.cc',
-           ],
-        }],
-      ],
     },  # target libjingle_peerconnection
   ],
 }