generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make audio_device build in binary build and source build

Browse Source 
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
This commit is contained in:
leozwang@webrtc.org 2012-09-12 21:43:47 +00:00
parent d58deb3df2
commit d47585399d
1 changed files with 0 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/audio_device/main/interface/audio_device.h
View File

@ -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 {