Revert "Revert 7826 "Change Android PeerConnectionUnittest to build usin...""

Original cl description:

Change Android PeerConnectionUnittest to build using Chrome macros.
The purpose is to be able to run the tests using Chromes buildbots. To run:
CHECKOUT_SOURCE_ROOT=`pwd` build/android/test_runner.py instrumentation --test-apk=libjingle_peerconnection_android_unittest

This also add a new build target to build java PeerConnection using Chromes build macros.

BUG=4031
R=kjellander@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/26349004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@7874 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/libjingle.gyp

@@ -45,7 +45,7 @@
       'targets': [
         {
           'target_name': 'libjingle_peerconnection_so',
-          'type': 'loadable_module',
+          'type': 'shared_library',
           'dependencies': [
             'libjingle_peerconnection',
             '<(DEPTH)/third_party/icu/icu.gyp:icuuc',
@@ -159,6 +159,34 @@
         },
       ],
     }],
+    ['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': {
+            'java_in_dir': 'app/webrtc/java',
+            'webrtc_modules_dir': '<(webrtc_root)/modules',
+            'additional_src_dirs' : [
+              'app/webrtc/java/android',
+              '<(webrtc_modules_dir)/audio_device/android/java/src',
+              '<(webrtc_modules_dir)/video_capture/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" and mac_sdk>="10.7")', {
       # The >= 10.7 above is required for ARC.
       'targets': [