Restructuring and removing neteq_tests.gypi according to project structure discussed with Andrew. We want to flatten out the hierarchy and minimize the number of GYP files.

I also fixed compilation on Mac (by enabling exceptions for the NetEqTestTools target). Executing the test fails on Mac, but I assume this is because it checks bit exactness, similar to the issue we had with audio_coding_module (see issue 114)

Review URL: http://webrtc-codereview.appspot.com/255004

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

src/modules/audio_coding/NetEQ/main/neteq_tests.gypi

@@ -1,30 +0,0 @@
-# Copyright (c) 2011 The WebRTC project authors. All Rights Reserved.
-#
-# Use of this source code is governed by a BSD-style license
-# that can be found in the LICENSE file in the root of the source
-# tree. An additional intellectual property rights grant can be found
-# in the file PATENTS.  All contributing project authors may
-# be found in the AUTHORS file in the root of the source tree.
-
-{
-  'targets': [
-    {
-      'target_name': 'neteq_unittest',
-      'type': 'executable',
-      'dependencies': [
-        'NetEq',
-        'NetEqTestTools',
-        '<(webrtc_root)/../testing/gtest.gyp:gtest',
-      ],
-      'sources': [
-        'source/neteq_api_unittest.cc',
-      ],
-    },
-  ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:

src/modules/audio_coding/neteq/Android.mk

@@ -10,7 +10,7 @@ LOCAL_PATH := $(call my-dir)
 
 include $(CLEAR_VARS)
 
-include $(LOCAL_PATH)/../../../../../../android-webrtc.mk
+include $(LOCAL_PATH)/../../../../android-webrtc.mk
 
 LOCAL_ARM_MODE := arm
 LOCAL_MODULE_CLASS := STATIC_LIBRARIES
@@ -57,10 +57,10 @@ LOCAL_CFLAGS := \
     '-DNETEQ_VOICEENGINE_CODECS'
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../interface \
+    $(LOCAL_PATH)/interface \
-    $(LOCAL_PATH)/../../../codecs/CNG/main/interface \
+    $(LOCAL_PATH)/../codecs/CNG/main/interface \
-    $(LOCAL_PATH)/../../../../.. \
+    $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../../../../../common_audio/signal_processing_library/main/interface 
+    $(LOCAL_PATH)/../../../common_audio/signal_processing_library/main/interface 
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \

src/modules/audio_coding/neteq/neteq.gypi

@@ -20,17 +20,17 @@
         'SCRATCH',                  # specifies a subset of codecs to support.
       ],
       'include_dirs': [
-        '../interface',
+        'interface',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'interface',
         ],
       },
       'sources': [
-        '../interface/webrtc_neteq.h',
+        'interface/webrtc_neteq.h',
-        '../interface/webrtc_neteq_help_macros.h',
+        'interface/webrtc_neteq_help_macros.h',
-        '../interface/webrtc_neteq_internal.h',
+        'interface/webrtc_neteq_internal.h',
         'accelerate.c',
         'automode.c',
         'automode.h',
@@ -85,9 +85,21 @@
     },
   ], # targets
   # Exclude the test target when building with chromium.
-  'conditions': [   
+  'conditions': [
     ['build_with_chromium==0', {
       'targets': [
+        {
+          'target_name': 'neteq_unittests',
+          'type': 'executable',
+          'dependencies': [
+            'NetEq',
+            'NetEqTestTools',
+            '<(webrtc_root)/../testing/gtest.gyp:gtest',
+          ],
+          'sources': [
+            'neteq_api_unittest.cc',
+          ],
+        }, # neteq_unittests
         {
           'target_name': 'NetEqRTPplay',
           'type': 'executable',
@@ -118,11 +130,11 @@
             'CODEC_RED',
           ],
           'include_dirs': [
-            './',
+            '.',
-            '../test',
+            'test',
           ],
           'sources': [
-            '../test/NetEqRTPplay.cc',
+            'test/NetEqRTPplay.cc',
           ],
         },
        {
@@ -155,80 +167,58 @@
             'CODEC_RED',
           ],
           'include_dirs': [
-            '../interface',
+            'interface',
-            '../test',
+            'test',
           ],
           'sources': [
-            '../test/RTPencode.cc',
+            'test/RTPencode.cc',
           ],
         },
         {
           'target_name': 'RTPjitter',
           'type': 'executable',
-          'dependencies': [
-          ],
-          'defines': [
-          ],
-          'include_dirs': [
-          ],
           'sources': [
-            '../test/RTPjitter.cc',
+            'test/RTPjitter.cc',
           ],
-       },
+        },
-       {
+        {
           'target_name': 'RTPanalyze',
           'type': 'executable',
           'dependencies': [
             'NetEqTestTools',
-         ],
-          'defines': [
           ],
-         'include_dirs': [
-         ],
           'sources': [
-            '../test/RTPanalyze.cc',
+            'test/RTPanalyze.cc',
           ],
-       },
+        },
         {
           'target_name': 'RTPchange',
           'type': 'executable',
           'dependencies': [
             'NetEqTestTools',
           ],
-          'defines': [
+          'sources': [
+           'test/RTPchange.cc',
           ],
-         'include_dirs': [
-          ],
-         'sources': [
-           '../test/RTPchange.cc',
-         ],
         },
         {
           'target_name': 'RTPtimeshift',
-         'type': 'executable',
+          'type': 'executable',
           'dependencies': [
            'NetEqTestTools',
           ],
-          'defines': [
-          ],
-          'include_dirs': [
-          ],
           'sources': [
-           '../test/RTPtimeshift.cc',
+            'test/RTPtimeshift.cc',
-         ],
+          ],
-       },
+        },
         {
           'target_name': 'RTPcat',
-         'type': 'executable',
+          'type': 'executable',
-         'dependencies': [
+          'dependencies': [
-           'NetEqTestTools',
+            'NetEqTestTools',
-         ],
-         'defines': [
           ],
-          'include_dirs': [
+          'sources': [
-         ],
+            'test/RTPcat.cc',
-         'sources': [
-           '../test/RTPcat.cc',
           ],
         },
         {
@@ -245,8 +235,8 @@
           ],
           'direct_dependent_settings': {
             'include_dirs': [
-              '../test',
+              'interface',
-              '../interface',
+              'test',
             ],
           },
           'defines': [
@@ -266,25 +256,29 @@
             'CODEC_RED',
           ],
           'include_dirs': [
-            './',
+            'interface',
-            '../interface',
+            'test',
-            '../test',
           ],
           'sources': [
-            '../test/NETEQTEST_NetEQClass.cc',
+            'test/NETEQTEST_NetEQClass.cc',
-            '../test/NETEQTEST_RTPpacket.cc',
+            'test/NETEQTEST_RTPpacket.cc',
-            '../test/NETEQTEST_CodecClass.cc',
+            'test/NETEQTEST_CodecClass.cc',
-            '../test/NETEQTEST_NetEQClass.h',
+            'test/NETEQTEST_NetEQClass.h',
-            '../test/NETEQTEST_RTPpacket.h',
+            'test/NETEQTEST_RTPpacket.h',
-            '../test/NETEQTEST_CodecClass.h',
+            'test/NETEQTEST_CodecClass.h',
           ],
           'conditions': [
-            ['OS=="linux"', {
+            ['OS=="linux" or OS=="mac"', {
-             'cflags': [
+              'cflags': [
-               '-fexceptions', # enable exceptions
+                '-fexceptions', # enable exceptions
               ],
-           }],
+            }],
-          ],
+            ['OS=="mac"', {
+              'xcode_settings': {
+                'GCC_ENABLE_CPP_EXCEPTIONS': 'YES', # -fexceptions
+               }
+            }],
+          ], # conditions
         },
       ], # targets
     }], # build_with_chromium

src/modules/audio_coding/neteq/neteq_api_unittest.cc

@@ -20,12 +20,12 @@
 
 #include "gtest/gtest.h"
 
-#include "modules/audio_coding/NetEQ/main/test/NETEQTEST_CodecClass.h"
+#include "modules/audio_coding/neteq/test/NETEQTEST_CodecClass.h"
-#include "modules/audio_coding/NetEQ/main/test/NETEQTEST_NetEQClass.h"
+#include "modules/audio_coding/neteq/test/NETEQTEST_NetEQClass.h"
-#include "modules/audio_coding/NetEQ/main/test/NETEQTEST_RTPpacket.h"
+#include "modules/audio_coding/neteq/test/NETEQTEST_RTPpacket.h"
 #include "typedefs.h"  // NOLINT(build/include)
-#include "modules/audio_coding/NetEQ/main/interface/webrtc_neteq.h"
+#include "modules/audio_coding/neteq/interface/webrtc_neteq.h"
-#include "modules/audio_coding/NetEQ/main/interface/webrtc_neteq_help_macros.h"
+#include "modules/audio_coding/neteq/interface/webrtc_neteq_help_macros.h"
 
 namespace {
 

src/modules/modules.gyp

@@ -17,7 +17,7 @@
     'audio_coding/codecs/iSAC/fix/source/isacfix.gypi',
     'audio_coding/codecs/PCM16B/main/source/pcm16b.gypi',
     'audio_coding/main/source/audio_coding_module.gypi',
-    'audio_coding/NetEQ/main/source/neteq.gypi',
+    'audio_coding/neteq/neteq.gypi',
     'audio_conference_mixer/source/audio_conference_mixer.gypi',
     'audio_device/main/source/audio_device.gypi',
     'audio_processing/audio_processing.gypi',
@@ -45,7 +45,6 @@
       'includes': [
         'audio_coding/codecs/iSAC/isac_test.gypi',
         'audio_coding/codecs/iSAC/isacfix_test.gypi',
-        'audio_coding/NetEQ/main/neteq_tests.gypi',
         'audio_processing/apm_tests.gypi',
         'rtp_rtcp/source/rtp_rtcp_tests.gypi',
         'rtp_rtcp/test/test_bwe/test_bwe.gypi',