From 706a546f692ac63ac37b7847211a7e420448e272 Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Fri, 7 Sep 2012 20:26:43 +0000 Subject: [PATCH] Change include path Message: The background, when we make a binary delivery, typically user puts header files and library file in a flat folder, so include "x/y/z/header.h" doesn't work. I know it's against google style, but it's something we have to workaround. I can also do #ifdef 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 This is a workaround before we build everything from source which will happen eventually, but might be couple months later. Description: Change include path to make it build in a standalone delivery. BUG=None TEST=local test Review URL: https://webrtc-codereview.appspot.com/778004 git-svn-id: http://webrtc.googlecode.com/svn/trunk@2720 4adac7df-926f-26a2-2b94-8c16560cd09d --- src/modules/audio_device/main/interface/audio_device.h | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/modules/audio_device/main/interface/audio_device.h b/src/modules/audio_device/main/interface/audio_device.h index 30b776d02..3be59b012 100644 --- a/src/modules/audio_device/main/interface/audio_device.h +++ b/src/modules/audio_device/main/interface/audio_device.h @@ -11,8 +11,16 @@ #ifndef MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_ #define MODULES_AUDIO_DEVICE_MAIN_INTERFACE_AUDIO_DEVICE_H_ +#ifdef WEBRTC_ANDROID +// 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 {