Restructuring and adding unit test targets on project level instead of in common_audio.

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

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

Android.mk

@@ -9,9 +9,9 @@
 MY_WEBRTC_ROOT_PATH := $(call my-dir)
 
 # voice
-include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/resampler/main/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/signal_processing_library/main/source/Android.mk
-include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/vad/main/source/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/resampler/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/signal_processing/Android.mk
+include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/vad/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/neteq/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/CNG/main/source/Android.mk
 include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/G711/main/source/Android.mk

src/common_audio/common_audio.gyp

@@ -9,28 +9,8 @@
 {
   'includes': [
     '../build/common.gypi',
-    'signal_processing_library/main/source/spl.gypi',
-    'resampler/main/source/resampler.gypi',
-    'vad/main/source/vad.gypi',
-  ],
-  'conditions': [
-    ['build_with_chromium==0', {
-      'targets' : [
-        {
-          'target_name': 'common_audio_unittests',
-          'type': 'executable',
-          'dependencies': [
-            '<(webrtc_root)/../test/test.gyp:test_support_main',
-            '<(webrtc_root)/../testing/gtest.gyp:gtest',
-            'resampler',
-            'vad',
-          ],
-          'sources': [
-            'resampler/main/source/resampler_unittest.cc',
-            'vad/test/vad_unittest.cc',
-          ],
-        },
-      ],
-    }],
+    'signal_processing/signal_processing.gypi',
+    'resampler/resampler.gypi',
+    'vad/vad.gypi',
   ],
 }

src/common_audio/resampler/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
@@ -24,9 +24,9 @@ LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../interface \
-    $(LOCAL_PATH)/../../../.. \
-    $(LOCAL_PATH)/../../../signal_processing_library/main/interface 
+    $(LOCAL_PATH)/include \
+    $(LOCAL_PATH)/../.. \
+    $(LOCAL_PATH)/../signal_processing/include 
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \

src/common_audio/resampler/resampler.gypi

@@ -12,22 +12,40 @@
       'target_name': 'resampler',
       'type': '<(library)',
       'dependencies': [
-        'spl',
+        'signal_processing',
       ],
       'include_dirs': [
-        '../interface',
+        'include',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'include',
         ],
       },
       'sources': [
-        '../interface/resampler.h',
+        'include/resampler.h',
         'resampler.cc',
       ],
     },
-  ],
+  ], # targets
+  'conditions': [
+    ['build_with_chromium==0', {
+      'targets' : [
+        {
+          'target_name': 'resampler_unittests',
+          'type': 'executable',
+          'dependencies': [
+            'resampler',
+            '<(webrtc_root)/../test/test.gyp:test_support_main',
+            '<(webrtc_root)/../testing/gtest.gyp:gtest',
+          ],
+          'sources': [
+            'resampler_unittest.cc',
+          ],
+        }, # resampler_unittests
+      ], # targets
+    }], # build_with_chromium
+  ], # conditions
 }
 
 # Local Variables:

src/common_audio/resampler/resampler_unittest.cc

@@ -10,7 +10,7 @@
 
 #include "gtest/gtest.h"
 
-#include "common_audio/resampler/main/interface/resampler.h"
+#include "common_audio/resampler/include/resampler.h"
 
 // TODO(andrew): this is a work-in-progress. Many more tests are needed.
 

src/common_audio/signal_processing/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
@@ -61,8 +61,8 @@ LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../interface \
-    $(LOCAL_PATH)/../../../.. 
+    $(LOCAL_PATH)/include \
+    $(LOCAL_PATH)/../.. 
 
 ifeq ($(ARCH_ARM_HAVE_NEON),true)
 LOCAL_SRC_FILES += \

src/common_audio/signal_processing/signal_processing.gypi

@@ -9,19 +9,19 @@
 {
   'targets': [
     {
-      'target_name': 'spl',
+      'target_name': 'signal_processing',
       'type': '<(library)',
       'include_dirs': [
-        '../interface',
+        'include',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'include',
         ],
       },
       'sources': [
-        '../interface/signal_processing_library.h',
-        '../interface/spl_inl.h',
+        'include/signal_processing_library.h',
+        'include/spl_inl.h',
         'auto_corr_to_refl_coef.c',
         'auto_correlation.c',
         'complex_fft.c',
@@ -62,8 +62,26 @@
         'sqrt_of_one_minus_x_squared.c',
         'vector_scaling_operations.c',
       ],
-    },
-  ],
+    }, # spl
+  ], # targets
+  'conditions': [
+    ['build_with_chromium==0', {
+      'targets': [
+        {
+          'target_name': 'signal_processing_unittests',
+          'type': 'executable',
+          'dependencies': [
+            'signal_processing',
+            '<(webrtc_root)/../test/test.gyp:test_support_main',
+            '<(webrtc_root)/../testing/gtest.gyp:gtest',
+          ],
+          'sources': [
+            'signal_processing_unittest.cc',
+          ],
+        }, # spl_unittests
+      ], # targets
+    }], # build_with_chromium
+  ], # conditions
 }
 
 # Local Variables:

src/common_audio/signal_processing/signal_processing_unittest.cc

@@ -8,33 +8,19 @@
  *  be found in the AUTHORS file in the root of the source tree.
  */
 
-
-/*
- * This file contains the SPL unit_test.
- *
- */
-
-#include "unit_test.h"
 #include "signal_processing_library.h"
+#include "gtest/gtest.h"
 
-class SplEnvironment : public ::testing::Environment {
- public:
-  virtual void SetUp() {
+class SplTest : public testing::Test {
+ protected:
+  virtual ~SplTest() {
   }
-  virtual void TearDown() {
+  void SetUp() {
+  }
+  void TearDown() {
   }
 };
 
-SplTest::SplTest()
-{
-}
-
-void SplTest::SetUp() {
-}
-
-void SplTest::TearDown() {
-}
-
 TEST_F(SplTest, MacroTest) {
     // Macros with inputs.
     int A = 10;
@@ -42,7 +28,6 @@ TEST_F(SplTest, MacroTest) {
     int a = -3;
     int b = WEBRTC_SPL_WORD32_MAX;
     int nr = 2;
-    int d_ptr1 = 0;
     int d_ptr2 = 0;
 
     EXPECT_EQ(10, WEBRTC_SPL_MIN(A, B));
@@ -56,19 +41,19 @@ TEST_F(SplTest, MacroTest) {
 
     EXPECT_EQ(-63, WEBRTC_SPL_MUL(a, B));
     EXPECT_EQ(-2147483645, WEBRTC_SPL_MUL(a, b));
-    EXPECT_EQ(-2147483645, WEBRTC_SPL_UMUL(a, b));
+    EXPECT_EQ(-2147483645u, WEBRTC_SPL_UMUL(a, b));
     b = WEBRTC_SPL_WORD16_MAX >> 1;
-    EXPECT_EQ(65535, WEBRTC_SPL_UMUL_RSFT16(a, b));
-    EXPECT_EQ(1073627139, WEBRTC_SPL_UMUL_16_16(a, b));
-    EXPECT_EQ(16382, WEBRTC_SPL_UMUL_16_16_RSFT16(a, b));
-    EXPECT_EQ(-49149, WEBRTC_SPL_UMUL_32_16(a, b));
-    EXPECT_EQ(65535, WEBRTC_SPL_UMUL_32_16_RSFT16(a, b));
+    EXPECT_EQ(65535u, WEBRTC_SPL_UMUL_RSFT16(a, b));
+    EXPECT_EQ(1073627139u, WEBRTC_SPL_UMUL_16_16(a, b));
+    EXPECT_EQ(16382u, WEBRTC_SPL_UMUL_16_16_RSFT16(a, b));
+    EXPECT_EQ(-49149u, WEBRTC_SPL_UMUL_32_16(a, b));
+    EXPECT_EQ(65535u, WEBRTC_SPL_UMUL_32_16_RSFT16(a, b));
     EXPECT_EQ(-49149, WEBRTC_SPL_MUL_16_U16(a, b));
 
     a = b;
     b = -3;
     EXPECT_EQ(-5461, WEBRTC_SPL_DIV(a, b));
-    EXPECT_EQ(0, WEBRTC_SPL_UDIV(a, b));
+    EXPECT_EQ(0u, WEBRTC_SPL_UDIV(a, b));
 
     EXPECT_EQ(-1, WEBRTC_SPL_MUL_16_32_RSFT16(a, b));
     EXPECT_EQ(-1, WEBRTC_SPL_MUL_16_32_RSFT15(a, b));
@@ -99,9 +84,10 @@ TEST_F(SplTest, MacroTest) {
     EXPECT_TRUE(WEBRTC_SPL_IS_NEG(b));
 
     // Shifting with negative numbers allowed
+    int shift_amount = 1;  // Workaround compiler warning using variable here.
     // Positive means left shift
-    EXPECT_EQ(32766, WEBRTC_SPL_SHIFT_W16(a, 1));
-    EXPECT_EQ(32766, WEBRTC_SPL_SHIFT_W32(a, 1));
+    EXPECT_EQ(32766, WEBRTC_SPL_SHIFT_W16(a, shift_amount));
+    EXPECT_EQ(32766, WEBRTC_SPL_SHIFT_W32(a, shift_amount));
 
     // Shifting with negative numbers not allowed
     // We cannot do casting here due to signed/unsigned problem
@@ -112,14 +98,13 @@ TEST_F(SplTest, MacroTest) {
 
     EXPECT_EQ(8191, WEBRTC_SPL_RSHIFT_U16(a, 1));
     EXPECT_EQ(32766, WEBRTC_SPL_LSHIFT_U16(a, 1));
-    EXPECT_EQ(8191, WEBRTC_SPL_RSHIFT_U32(a, 1));
-    EXPECT_EQ(32766, WEBRTC_SPL_LSHIFT_U32(a, 1));
+    EXPECT_EQ(8191u, WEBRTC_SPL_RSHIFT_U32(a, 1));
+    EXPECT_EQ(32766u, WEBRTC_SPL_LSHIFT_U32(a, 1));
 
     EXPECT_EQ(1470, WEBRTC_SPL_RAND(A));
 }
 
 TEST_F(SplTest, InlineTest) {
-
     WebRtc_Word16 a = 121;
     WebRtc_Word16 b = -17;
     WebRtc_Word32 A = 111121;
@@ -141,7 +126,6 @@ TEST_F(SplTest, InlineTest) {
 }
 
 TEST_F(SplTest, MathOperationsTest) {
-
     int A = 117;
     WebRtc_Word32 num = 117;
     WebRtc_Word32 den = -5;
@@ -153,16 +137,13 @@ TEST_F(SplTest, MathOperationsTest) {
     EXPECT_EQ(-91772805, WebRtcSpl_DivResultInQ31(den, num));
     EXPECT_EQ(-23, WebRtcSpl_DivW32W16ResW16(num, (WebRtc_Word16)den));
     EXPECT_EQ(-23, WebRtcSpl_DivW32W16(num, (WebRtc_Word16)den));
-    EXPECT_EQ(23, WebRtcSpl_DivU32U16(num, denU));
+    EXPECT_EQ(23u, WebRtcSpl_DivU32U16(num, denU));
     EXPECT_EQ(0, WebRtcSpl_DivW32HiLow(128, 0, 256));
 }
 
 TEST_F(SplTest, BasicArrayOperationsTest) {
-
-
     const int kVectorSize = 4;
     int B[] = {4, 12, 133, 1100};
-    int Bs[] = {2, 6, 66, 550};
     WebRtc_UWord8 b8[kVectorSize];
     WebRtc_Word16 b16[kVectorSize];
     WebRtc_Word32 b32[kVectorSize];
@@ -238,12 +219,9 @@ TEST_F(SplTest, BasicArrayOperationsTest) {
     for (int kk = 0; kk < kVectorSize; ++kk) {
         EXPECT_EQ(b16[3-kk], bTmp16[kk]);
     }
-
 }
 
 TEST_F(SplTest, MinMaxOperationsTest) {
-
-
     const int kVectorSize = 4;
     int B[] = {4, 12, 133, -1100};
     WebRtc_Word16 b16[kVectorSize];
@@ -268,12 +246,9 @@ TEST_F(SplTest, MinMaxOperationsTest) {
     EXPECT_EQ(3, WebRtcSpl_MinIndexW32(b32, kVectorSize));
 
     EXPECT_EQ(0, WebRtcSpl_GetScalingSquare(b16, kVectorSize, 1));
-
 }
 
 TEST_F(SplTest, VectorOperationsTest) {
-
-
     const int kVectorSize = 4;
     int B[] = {4, 12, 133, 1100};
     WebRtc_Word16 a16[kVectorSize];
@@ -341,8 +316,6 @@ TEST_F(SplTest, VectorOperationsTest) {
 }
 
 TEST_F(SplTest, EstimatorsTest) {
-
-
     const int kVectorSize = 4;
     int B[] = {4, 12, 133, 1100};
     WebRtc_Word16 b16[kVectorSize];
@@ -355,12 +328,9 @@ TEST_F(SplTest, EstimatorsTest) {
     }
 
     EXPECT_EQ(0, WebRtcSpl_LevinsonDurbin(b32, b16, bTmp16, 2));
-
 }
 
 TEST_F(SplTest, FilterTest) {
-
-
     const int kVectorSize = 4;
     WebRtc_Word16 A[] = {1, 2, 33, 100};
     WebRtc_Word16 A5[] = {1, 2, 33, 100, -5};
@@ -399,19 +369,15 @@ TEST_F(SplTest, FilterTest) {
                                               bTmp16,
                                               bTmp16Low,
                                               kVectorSize));
-
 }
 
 TEST_F(SplTest, RandTest) {
-
-
     const int kVectorSize = 4;
     WebRtc_Word16 BU[] = {3653, 12446, 8525, 30691};
-    WebRtc_Word16 BN[] = {3459, -11689, -258, -3738};
     WebRtc_Word16 b16[kVectorSize];
     WebRtc_UWord32 bSeed = 100000;
 
-    EXPECT_EQ(464449057, WebRtcSpl_IncreaseSeed(&bSeed));
+    EXPECT_EQ(464449057u, WebRtcSpl_IncreaseSeed(&bSeed));
     EXPECT_EQ(31565, WebRtcSpl_RandU(&bSeed));
     EXPECT_EQ(-9786, WebRtcSpl_RandN(&bSeed));
     EXPECT_EQ(kVectorSize, WebRtcSpl_RandUArray(b16, kVectorSize, &bSeed));
@@ -421,8 +387,6 @@ TEST_F(SplTest, RandTest) {
 }
 
 TEST_F(SplTest, SignalProcessingTest) {
-
-
     const int kVectorSize = 4;
     int A[] = {1, 2, 33, 100};
     WebRtc_Word16 b16[kVectorSize];
@@ -464,8 +428,6 @@ TEST_F(SplTest, SignalProcessingTest) {
 }
 
 TEST_F(SplTest, FFTTest) {
-
-
     WebRtc_Word16 B[] = {1, 2, 33, 100,
             2, 3, 34, 101,
             3, 4, 35, 102,
@@ -484,11 +446,3 @@ TEST_F(SplTest, FFTTest) {
         //EXPECT_EQ(A[kk], B[kk]);
     }
 }
-
-int main(int argc, char** argv) {
-  ::testing::InitGoogleTest(&argc, argv);
-  SplEnvironment* env = new SplEnvironment;
-  ::testing::AddGlobalTestEnvironment(env);
-
-  return RUN_ALL_TESTS();
-}

src/common_audio/signal_processing_library/main/test/unit_test/unit_test.h

@@ -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.
- */
-
-/*
- * This header file contains the function WebRtcSpl_CopyFromBeginU8().
- * The description header can be found in signal_processing_library.h
- *
- */
-
-#ifndef WEBRTC_SPL_UNIT_TEST_H_
-#define WEBRTC_SPL_UNIT_TEST_H_
-
-#include <gtest/gtest.h>
-
-class SplTest: public ::testing::Test
-{
-protected:
-    SplTest();
-    virtual void SetUp();
-    virtual void TearDown();
-};
-
-#endif  // WEBRTC_SPL_UNIT_TEST_H_

src/common_audio/vad/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
@@ -28,9 +28,9 @@ LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../interface \
-    $(LOCAL_PATH)/../../../.. \
-    $(LOCAL_PATH)/../../../signal_processing_library/main/interface 
+    $(LOCAL_PATH)/include \
+    $(LOCAL_PATH)/../.. \
+    $(LOCAL_PATH)/../signal_processing/include 
 
 LOCAL_SHARED_LIBRARIES := \
     libdl \

src/common_audio/vad/vad.gypi

@@ -12,18 +12,18 @@
       'target_name': 'vad',
       'type': '<(library)',
       'dependencies': [
-        'spl',
+        'signal_processing',
       ],
       'include_dirs': [
-        '../interface',
+        'include',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'include',
         ],
       },
       'sources': [
-        '../interface/webrtc_vad.h',
+        'include/webrtc_vad.h',
         'webrtc_vad.c',
         'vad_core.c',
         'vad_core.h',
@@ -36,7 +36,25 @@
         'vad_sp.h',
       ],
     },
-  ],
+  ], # targets
+   'conditions': [
+    ['build_with_chromium==0', {
+      'targets' : [
+        {
+          'target_name': 'vad_unittests',
+          'type': 'executable',
+          'dependencies': [
+            'vad',
+            '<(webrtc_root)/../test/test.gyp:test_support_main',
+            '<(webrtc_root)/../testing/gtest.gyp:gtest',
+          ],
+          'sources': [
+            'vad_unittest.cc',
+          ],
+        }, # vad_unittests
+      ], # targets
+    }], # build_with_chromium
+  ], # conditions
 }
 
 # Local Variables:

src/modules/audio_coding/codecs/CNG/main/source/Android.mk

@@ -28,7 +28,7 @@ LOCAL_CFLAGS := \
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../interface \
     $(LOCAL_PATH)/../../../../../.. \
-    $(LOCAL_PATH)/../../../../../../common_audio/signal_processing_library/main/interface 
+    $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include 
 
 LOCAL_SHARED_LIBRARIES := \
     libdl \

src/modules/audio_coding/codecs/CNG/main/source/cng.gypi

@@ -12,7 +12,7 @@
       'target_name': 'CNG',
       'type': '<(library)',
       'dependencies': [
-        '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+        '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
       ],
       'include_dirs': [
         '../interface',

src/modules/audio_coding/codecs/iSAC/fix/source/Android.mk

@@ -49,7 +49,7 @@ LOCAL_CFLAGS := \
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../interface \
     $(LOCAL_PATH)/../../../../../.. \
-    $(LOCAL_PATH)/../../../../../../common_audio/signal_processing_library/main/interface 
+    $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include 
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \

src/modules/audio_coding/codecs/iSAC/fix/source/isacfix.gypi

@@ -12,7 +12,7 @@
       'target_name': 'iSACFix',
       'type': '<(library)',
       'dependencies': [
-        '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+        '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
       ],
       'include_dirs': [
         '../interface',

src/modules/audio_coding/codecs/iSAC/isac_test.gypi

@@ -52,7 +52,7 @@
       'include_dirs': [
         './main/test',
         './main/interface',
-        '../../../../common_audio/signal_processing_library/main/interface',
+        '../../../../common_audio/signal_processing/include',
         './main/util',
       ],
       'sources': [

src/modules/audio_coding/codecs/iSAC/main/source/Android.mk

@@ -53,7 +53,7 @@ LOCAL_CFLAGS := \
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../interface \
     $(LOCAL_PATH)/../../../../../.. \
-    $(LOCAL_PATH)/../../../../../../common_audio/signal_processing_library/main/interface 
+    $(LOCAL_PATH)/../../../../../../common_audio/signal_processing/include 
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \

src/modules/audio_coding/codecs/iSAC/main/source/isac.gypi

@@ -12,7 +12,7 @@
       'target_name': 'iSAC',
       'type': '<(library)',
       'dependencies': [
-        '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+        '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
       ],
       'include_dirs': [
         '../interface',

src/modules/audio_coding/codecs/ilbc/Android.mk

@@ -93,7 +93,7 @@ LOCAL_CFLAGS := \
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/interface \
     $(LOCAL_PATH)/../../../.. \
-    $(LOCAL_PATH)/../../../../common_audio/signal_processing_library/main/interface 
+    $(LOCAL_PATH)/../../../../common_audio/signal_processing/include 
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \

src/modules/audio_coding/codecs/ilbc/ilbc.gypi

@@ -12,7 +12,7 @@
       'target_name': 'iLBC',
       'type': '<(library)',
       'dependencies': [
-        '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+        '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
       ],
       'include_dirs': [
         'interface',

src/modules/audio_coding/main/source/Android.mk

@@ -51,9 +51,9 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../neteq/interface \
     $(LOCAL_PATH)/../../../.. \
     $(LOCAL_PATH)/../../../interface \
-    $(LOCAL_PATH)/../../../../common_audio/resampler/main/interface \
-    $(LOCAL_PATH)/../../../../common_audio/signal_processing_library/main/interface \
-    $(LOCAL_PATH)/../../../../common_audio/vad/main/interface \
+    $(LOCAL_PATH)/../../../../common_audio/resampler/include \
+    $(LOCAL_PATH)/../../../../common_audio/signal_processing/include \
+    $(LOCAL_PATH)/../../../../common_audio/vad/include \
     $(LOCAL_PATH)/../../../../system_wrappers/interface 
 
 LOCAL_SHARED_LIBRARIES := \

src/modules/audio_coding/main/source/audio_coding_module.gypi

@@ -21,7 +21,7 @@
         'PCM16B',
         'NetEq',
         '<(webrtc_root)/common_audio/common_audio.gyp:resampler',
-        '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+        '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
         '<(webrtc_root)/common_audio/common_audio.gyp:vad',
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
       ],

src/modules/audio_coding/neteq/Android.mk

@@ -60,7 +60,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/interface \
     $(LOCAL_PATH)/../codecs/CNG/main/interface \
     $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../../../common_audio/signal_processing_library/main/interface 
+    $(LOCAL_PATH)/../../../common_audio/signal_processing/include 
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \

src/modules/audio_coding/neteq/neteq.gypi

@@ -13,7 +13,7 @@
       'type': '<(library)',
       'dependencies': [
         'CNG',
-        '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+        '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
       ],
       'defines': [
         'NETEQ_VOICEENGINE_CODECS', # TODO: Should create a Chrome define which

src/modules/audio_device/main/source/Android.mk

@@ -40,8 +40,8 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../interface \
     $(LOCAL_PATH)/../../../.. \
     $(LOCAL_PATH)/../../../interface \
-    $(LOCAL_PATH)/../../../../common_audio/resampler/main/interface \
-    $(LOCAL_PATH)/../../../../common_audio/signal_processing_library/main/interface \
+    $(LOCAL_PATH)/../../../../common_audio/resampler/include \
+    $(LOCAL_PATH)/../../../../common_audio/signal_processing/include \
     $(LOCAL_PATH)/../../../../system_wrappers/interface \
     system/media/wilhelm/include
 

src/modules/audio_device/main/source/audio_device.gypi

@@ -13,7 +13,7 @@
       'type': '<(library)',
       'dependencies': [
         '<(webrtc_root)/common_audio/common_audio.gyp:resampler',
-        '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+        '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
       ],
       'include_dirs': [

src/modules/audio_processing/Android.mk

@@ -45,8 +45,8 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/ns/interface \
     $(LOCAL_PATH)/../interface \
     $(LOCAL_PATH)/../.. \
-    $(LOCAL_PATH)/../../common_audio/signal_processing_library/main/interface \
-    $(LOCAL_PATH)/../../common_audio/vad/main/interface \
+    $(LOCAL_PATH)/../../common_audio/signal_processing/include \
+    $(LOCAL_PATH)/../../common_audio/vad/include \
     $(LOCAL_PATH)/../../system_wrappers/interface \
     external/protobuf/src
 
@@ -121,7 +121,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../.. \
     $(LOCAL_PATH)/../../../test \
     $(LOCAL_PATH)/../../system_wrappers/interface \
-    $(LOCAL_PATH)/../../common_audio/signal_processing_library/main/interface \
+    $(LOCAL_PATH)/../../common_audio/signal_processing/include \
     external/gtest/include \
     external/protobuf/src
 

src/modules/audio_processing/aec/Android.mk

@@ -32,7 +32,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/interface \
     $(LOCAL_PATH)/../utility \
     $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../../../common_audio/signal_processing_library/main/interface
+    $(LOCAL_PATH)/../../../common_audio/signal_processing/include
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \

src/modules/audio_processing/aec/aec.gypi

@@ -12,7 +12,7 @@
       'target_name': 'aec',
       'type': '<(library)',
       'dependencies': [
-        '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+        '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
         'apm_util'
       ],
       'include_dirs': [

src/modules/audio_processing/aecm/Android.mk

@@ -35,7 +35,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/interface \
     $(LOCAL_PATH)/../utility \
     $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../../../common_audio/signal_processing_library/main/interface
+    $(LOCAL_PATH)/../../../common_audio/signal_processing/include
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \

src/modules/audio_processing/aecm/aecm.gypi

@@ -12,7 +12,7 @@
       'target_name': 'aecm',
       'type': '<(library)',
       'dependencies': [
-        '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+        '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
         'apm_util'
       ],
       'include_dirs': [

src/modules/audio_processing/agc/Android.mk

@@ -27,7 +27,7 @@ LOCAL_CFLAGS := \
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/interface \
     $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../../../common_audio/signal_processing_library/main/interface
+    $(LOCAL_PATH)/../../../common_audio/signal_processing/include
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \

src/modules/audio_processing/agc/agc.gypi

@@ -12,7 +12,7 @@
       'target_name': 'agc',
       'type': '<(library)',
       'dependencies': [
-        '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+        '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
       ],
       'include_dirs': [
         'interface',

src/modules/audio_processing/apm_tests.gypi

@@ -21,7 +21,7 @@
       'dependencies': [
         'audio_processing',
         'audioproc_unittest_proto',
-        '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+        '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
         '<(webrtc_root)/../test/test.gyp:test_support',
         '<(webrtc_root)/../testing/gtest.gyp:gtest',

src/modules/audio_processing/audio_processing.gypi

@@ -25,7 +25,7 @@
         'aec',
         'aecm',
         'agc',
-        '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+        '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
         '<(webrtc_root)/common_audio/common_audio.gyp:vad',
         '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
       ],

src/modules/audio_processing/ns/Android.mk

@@ -38,7 +38,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/interface \
     $(LOCAL_PATH)/../utility \
     $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../../../common_audio/signal_processing_library/main/interface 
+    $(LOCAL_PATH)/../../../common_audio/signal_processing/include 
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \

src/modules/audio_processing/ns/ns.gypi

@@ -12,7 +12,7 @@
       'target_name': 'ns',
       'type': '<(library)',
       'dependencies': [
-        '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+        '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
         'apm_util'
       ],
       'include_dirs': [
@@ -36,7 +36,7 @@
       'target_name': 'ns_fix',
       'type': '<(library)',
       'dependencies': [
-        '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+        '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
       ],
       'include_dirs': [
         'interface',

src/modules/audio_processing/utility/Android.mk

@@ -30,7 +30,7 @@ LOCAL_CFLAGS := \
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH) \
     $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../../../common_audio/signal_processing_library/main/interface
+    $(LOCAL_PATH)/../../../common_audio/signal_processing/include
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \

src/modules/audio_processing/utility/util.gypi

@@ -12,7 +12,7 @@
       'target_name': 'apm_util',
       'type': '<(library)',
       'dependencies': [
-        '<(webrtc_root)/common_audio/common_audio.gyp:spl',
+        '<(webrtc_root)/common_audio/common_audio.gyp:signal_processing',
       ],
       'direct_dependent_settings': {
         'include_dirs': [

src/modules/utility/source/Android.mk

@@ -39,7 +39,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../video_coding/codecs/interface \
     $(LOCAL_PATH)/../../.. \
     $(LOCAL_PATH)/../../../common_video/vplib/main/interface \
-    $(LOCAL_PATH)/../../../common_audio/resampler/main/interface \
+    $(LOCAL_PATH)/../../../common_audio/resampler/include \
     $(LOCAL_PATH)/../../../system_wrappers/interface 
 
 LOCAL_SHARED_LIBRARIES := \

src/modules/video_processing/main/source/Android.mk

@@ -38,7 +38,7 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../../interface \
     $(LOCAL_PATH)/../../../audio_coding/main/interface \
     $(LOCAL_PATH)/../../../utility/interface \
-    $(LOCAL_PATH)/../../../../common_audio/signal_processing_library/main/interface \
+    $(LOCAL_PATH)/../../../../common_audio/signal_processing/include \
     $(LOCAL_PATH)/../../../../common_video/vplib/main/interface \
     $(LOCAL_PATH)/../../../../system_wrappers/interface