Fix the Android compilation (better structure for NetEq test libs)

This change should make the Android targets compile again. The reason
for the failure was a highly dubious structure in the gypi files. With
this fix, the structure is somewhat cleaner. Still room for improvement.

BUG=3254
TBR=andrew@webrtc.org

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

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

webrtc/modules/audio_coding/neteq4/neteq.gypi

@@ -168,9 +168,6 @@
           'target_name': 'neteq_unittest_tools',
           'type': 'static_library',
           'dependencies': [
-            '<(DEPTH)/testing/gmock.gyp:gmock',
-            '<(DEPTH)/testing/gtest.gyp:gtest',
-            'PCM16B',  # Needed by neteq_performance_test.
             'rtp_rtcp',
           ],
           'direct_dependent_settings': {
@@ -186,8 +183,6 @@
             'tools/audio_loop.h',
             'tools/input_audio_file.cc',
             'tools/input_audio_file.h',
-            'tools/neteq_performance_test.cc',
-            'tools/neteq_performance_test.h',
             'tools/packet.cc',
             'tools/packet.h',
             'tools/packet_source.h',
@@ -195,8 +190,6 @@
             'tools/rtp_file_source.h',
             'tools/rtp_generator.cc',
             'tools/rtp_generator.h',
-            'tools/neteq_quality_test.cc',
-            'tools/neteq_quality_test.h',
           ],
         }, # neteq_unittest_tools
       ], # targets

webrtc/modules/audio_coding/neteq4/neteq_tests.gypi

@@ -153,13 +153,30 @@
       ],
     },
 
+    {
+      'target_name': 'neteq_test_support',
+      'type': 'static_library',
+      'dependencies': [
+        'NetEq4',
+        'PCM16B',
+        'neteq_unittest_tools',
+        '<(DEPTH)/testing/gtest.gyp:gtest',
+        '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
+      ],
+      'sources': [
+        'tools/neteq_performance_test.cc',
+        'tools/neteq_performance_test.h',
+        'tools/neteq_quality_test.cc',
+        'tools/neteq_quality_test.h',
+      ],
+    }, # neteq_test_support
+
     {
       'target_name': 'neteq4_speed_test',
       'type': 'executable',
       'dependencies': [
         'NetEq4',
-        'neteq_unittest_tools',
+        'neteq_test_support',
-        'PCM16B',
         '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
         '<(webrtc_root)/test/test.gyp:test_support_main',
       ],
@@ -173,7 +190,7 @@
       'type': 'executable',
       'dependencies': [
         'NetEq4',
-        'neteq_unittest_tools',
+        'neteq_test_support',
         'webrtc_opus',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',

webrtc/webrtc_tests.gypi

@@ -63,7 +63,7 @@
       'dependencies': [
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/third_party/gflags/gflags.gyp:gflags',
-        'modules/modules.gyp:neteq_unittest_tools',  # Needed by neteq_performance_unittest.
+        'modules/modules.gyp:neteq_test_support',  # Needed by neteq_performance_unittest.
         'modules/modules.gyp:rtp_rtcp',
         'test/webrtc_test_common.gyp:webrtc_test_common',
         'webrtc',