Reorganize audio_device to the standard layout.

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

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

src/modules/audio_device/audio_device.gypi

@@ -18,21 +18,20 @@
       ],
       'include_dirs': [
         '.',
-        '../../../interface',
         '../interface',
+        'include',
         'dummy', # dummy audio device
       ],
       'direct_dependent_settings': {
         'include_dirs': [
-          '../../../../',
-          '../../../interface',
           '../interface',
+          'include',
         ],
       },
       # TODO(xians): Rename files to e.g. *_linux.{ext}, remove sources in conditions section
       'sources': [
-        '../interface/audio_device.h',
+        'include/audio_device.h',
-        '../interface/audio_device_defines.h',
+        'include/audio_device_defines.h',
         'audio_device_buffer.cc',
         'audio_device_buffer.h',
         'audio_device_generic.cc',
@@ -64,13 +63,12 @@
         ['OS=="win"', {
           'include_dirs': [
             'win',
-            '../../../../../..',
           ],
         }],
         ['OS=="android"', {
-            'include_dirs': [
+          'include_dirs': [
-              'android',
+            'android',
-            ],
+          ],
         }], # OS==android
         ['include_internal_audio_device==0', {
           'defines': [
@@ -198,8 +196,8 @@
             '<(webrtc_root)/system_wrappers/source/system_wrappers.gyp:system_wrappers',
           ],
           'sources': [
-            '../test/audio_device_test_api.cc',
+            'test/audio_device_test_api.cc',
-            '../test/audio_device_test_defines.h',
+            'test/audio_device_test_defines.h',
           ],
         },
         {
@@ -214,10 +212,10 @@
             '<(DEPTH)/testing/gtest.gyp:gtest',
           ],
           'sources': [
-            '../test/audio_device_test_func.cc',
+            'test/audio_device_test_func.cc',
-            '../test/audio_device_test_defines.h',
+            'test/audio_device_test_defines.h',
-            '../test/func_test_manager.cc',
+            'test/func_test_manager.cc',
-            '../test/func_test_manager.h',
+            'test/func_test_manager.h',
           ],
         },
       ],
@@ -225,8 +223,3 @@
   ],
 }
 
-# Local Variables:
-# tab-width:2
-# indent-tabs-mode:nil
-# End:
-# vim: set expandtab tabstop=2 shiftwidth=2:

src/modules/audio_device/audio_device_buffer.h

@@ -12,7 +12,7 @@
 #define WEBRTC_AUDIO_DEVICE_AUDIO_DEVICE_BUFFER_H
 
 #include "typedefs.h"
-#include "../../../../common_audio/resampler/include/resampler.h"
+#include "common_audio/resampler/include/resampler.h"
 #include "file_wrapper.h"
 #include "audio_device.h"
 #include "list_wrapper.h"

src/modules/audio_device/include/audio_device.h

@@ -11,7 +11,7 @@
 #ifndef MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_
 #define MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_
 
-#include "modules/audio_device/main/interface/audio_device_defines.h"
+#include "modules/audio_device/include/audio_device_defines.h"
 #include "modules/interface/module.h"
 
 namespace webrtc {

src/modules/audio_device/test/audio_device_test_api.cc

@@ -17,9 +17,9 @@
 #include "gtest/gtest.h"
 #include "testsupport/fileutils.h"
 
-#include "../source/audio_device_config.h"
+#include "modules/audio_device/audio_device_config.h"
-#include "../source/audio_device_impl.h"
+#include "modules/audio_device/audio_device_impl.h"
-#include "../source/audio_device_utility.h"
+#include "modules/audio_device/audio_device_utility.h"
 #include "system_wrappers/interface/sleep.h"
 
 // Helper functions

src/modules/audio_device/test/func_test_manager.cc

@@ -18,8 +18,8 @@
 #include "system_wrappers/interface/sleep.h"
 #include "testsupport/fileutils.h"
 
-#include "../source/audio_device_config.h"
+#include "modules/audio_device/audio_device_config.h"
-#include "../source/audio_device_impl.h"
+#include "modules/audio_device/audio_device_impl.h"
 
 #ifndef __GNUC__
 // Disable warning message ('sprintf': name was marked as #pragma deprecated)

src/modules/audio_device/test/func_test_manager.h

@@ -11,7 +11,7 @@
 #ifndef WEBRTC_AUDIO_DEVICE_FUNC_TEST_MANAGER_H
 #define WEBRTC_AUDIO_DEVICE_FUNC_TEST_MANAGER_H
 
-#include "../source/audio_device_utility.h"
+#include "modules/audio_device/audio_device_utility.h"
 
 #include <string>
 

src/modules/modules.gyp

@@ -19,7 +19,7 @@
     'audio_coding/main/source/audio_coding_module.gypi',
     'audio_coding/neteq/neteq.gypi',
     'audio_conference_mixer/source/audio_conference_mixer.gypi',
-    'audio_device/main/source/audio_device.gypi',
+    'audio_device/audio_device.gypi',
     'audio_processing/audio_processing.gypi',
     'bitrate_controller/bitrate_controller.gypi',
     'media_file/source/media_file.gypi',

src/voice_engine/test/auto_test/standard/hardware_test.cc

@@ -9,7 +9,7 @@
  */
 
 #include "after_streaming_fixture.h"
-#include "audio_device.h"
+#include "modules/audio_device/include/audio_device.h"
 #include "voe_test_defines.h"
 
 class HardwareTest : public AfterStreamingFixture {

src/voice_engine/test/auto_test/voe_extended_test.h

@@ -12,7 +12,7 @@
 #define WEBRTC_VOICE_ENGINE_VOE_EXTENDED_TEST_H
 
 #include "voe_standard_test.h"
-#include "audio_device.h"
+#include "modules/audio_device/include/audio_device.h"
 
 namespace voetest {
 

src/voice_engine/voe_base_impl.cc

@@ -11,11 +11,11 @@
 #include "voe_base_impl.h"
 
 #include "audio_coding_module.h"
-#include "audio_device_impl.h"
 #include "audio_processing.h"
 #include "channel.h"
 #include "critical_section_wrapper.h"
 #include "file_wrapper.h"
+#include "modules/audio_device/audio_device_impl.h"
 #include "output_mixer.h"
 #include "signal_processing_library.h"
 #include "trace.h"