From d47585399de1644e618ac0bdc1bdbb1ffdc1765f Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Wed, 12 Sep 2012 21:43:47 +0000 Subject: [PATCH] Make audio_device build in binary build and source build BUG=issue 819 TEST=local test Message: This cl is going to address issue 819. The initial fix is https://code.google.com/p/webrtc/source/detail?r=2720. The problem happens because include file path is conflict in binary build and source build Description: I added stronger directive to work around this problem. Mike and Stefan, please check if it will break other builds. Review URL: https://webrtc-codereview.appspot.com/795007 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2765 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/audio_device/main/interface/audio_device.h | 8 -------- 1 file changed, 8 deletions(-) diff --git a/src/modules/audio_device/main/interface/audio_device.h b/src/modules/audio_device/main/interface/audio_device.h index dde9834df5..84d1d7267d 100644 --- a/src/modules/audio_device/main/interface/audio_device.h +++ b/src/modules/audio_device/main/interface/audio_device.h @@ -11,16 +11,8 @@ #ifndef MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_ #define MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_ -#ifdef HAVE_WEBRTC_VOICE -// TODO(leozwang): It's a temporal workaround for binary delivery, -// remove the following two lines once we can build from source -// on Android. #include "audio_device_defines.h" #include "module.h" -#else -#include "modules/audio_device/main/interface/audio_device_defines.h" -#include "modules/interface/module.h" -#endif namespace webrtc {