Restructuring and removing ilbc_test.gypi.

According to project structure discussed with Andrew. We want to flatten out the hierarchy and minimize the number of GYP files.

No changes at all are being made in the source files; they are just moved.
The only modified files are the GYP file and Android.mk

Kevin: I updated relative paths in Android.mk so please verify it is correct, since I don't know how to build that.

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

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

src/modules/audio_coding/codecs/iLBC/ilbc_test.gypi

@@ -1,32 +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': [
-    # ilbc_test
-    {
-      'target_name': 'iLBCtest',
-      'type': 'executable',
-      'dependencies': [
-        'iLBC',
-      ],
-      'include_dirs': [
-        './main/interface',
-      ],
-      'sources': [
-        './main/test/iLBC_test.c',
-      ],
-    },
-  ],
-}
-
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:

src/modules/audio_coding/codecs/ilbc/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_MODULE_CLASS := STATIC_LIBRARIES
 LOCAL_MODULE := libwebrtc_ilbc
@@ -91,9 +91,8 @@ LOCAL_CFLAGS := \
     $(MY_WEBRTC_COMMON_DEFS)
 
 LOCAL_C_INCLUDES := \
-    $(LOCAL_PATH)/../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/codecs/ilbc/ilbc.gypi

@@ -15,15 +15,15 @@
         '<(webrtc_root)/common_audio/common_audio.gyp:spl',
       ],
       'include_dirs': [
-        '../interface',
+        'interface',
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../interface',
+          'interface',
         ],
       },
       'sources': [
-        '../interface/ilbc.h',
+        'interface/ilbc.h',
         'abs_quant.c',
         'abs_quant_loop.c',
         'augmented_cb_corr.c',
@@ -162,9 +162,25 @@
         'vq4.h',
         'window32_w32.h',
         'xcorr_coef.h',
-     ],
+     ], # sources
-    },
+    }, # iLBC
-  ],
+  ], # targets
+  'conditions': [
+    ['build_with_chromium==0', {
+      'targets': [  
+        {
+          'target_name': 'iLBCtest',
+          'type': 'executable',
+          'dependencies': [
+            'iLBC',
+          ],
+          'sources': [
+            'test/iLBC_test.c',
+          ],
+        }, # iLBCtest
+      ], # targets
+    }], # build_with_chromium
+  ], # conditions
 }
 
 # Local Variables: