Revert of Add APK targets to build libjingle tests for Android.

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 25 matching lines @@
        }, {
          'variables': {
            'pkg-config': 'pkg-config'
          },
        }],
      ],
     }],
     ['OS=="linux" or OS=="android"', {
       'targets': [
         {
-          'target_name': 'libjingle_peerconnection_jni',
-          'type': 'static_library',
+          'target_name': 'libjingle_peerconnection_so',
+          'type': 'shared_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)',
                     ],
                   },
                 }],
               ],
             }],
+            ['OS=="android"', {
+              'sources': [
+                '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': [
+                '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/surfacetexturehelper_jni.cc',
+                'app/webrtc/java/jni/surfacetexturehelper_jni.h',
+              ]
+            }],
           ],
         },
         {
           '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.
@@ skipping 669 matching lines @@
         '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',
       ],
+      'conditions': [
+        ['OS=="android" and build_with_chromium==0', {
+          'sources': [
+            'app/webrtc/androidvideocapturer.h',
+            'app/webrtc/androidvideocapturer.cc',
+           ],
+        }],
+      ],
     },  # target libjingle_peerconnection
   ],
 }