Add Android include path so that header files can follow google style

BUG=1011
TEST=bot
Review URL: https://webrtc-codereview.appspot.com/930018

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

11 files changed, 37 insertions, 22 deletions

diff --git a/webrtc/common_audio/signal_processing/Android.mk b/webrtc/common_audio/signal_processing/Android.mk
index a0ebd6d63b..ecbc5ddf4e 100644
--- a/webrtc/common_audio/signal_processing/Android.mk
+++ b/webrtc/common_audio/signal_processing/Android.mk
@@ -55,7 +55,8 @@ LOCAL_CFLAGS := \
 
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/include \
-    $(LOCAL_PATH)/../.. 
+    $(LOCAL_PATH)/../.. \
+    external/webrtc
 
 ifeq ($(ARCH_ARM_HAVE_ARMV7A),true)
 LOCAL_SRC_FILES += \
@@ -113,7 +114,8 @@ LOCAL_CFLAGS := \
 
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/include \
-    $(LOCAL_PATH)/../.. 
+    $(LOCAL_PATH)/../.. \
+    external/webrtc
 
 ifndef NDK_ROOT
 include external/stlport/libstlport.mk
diff --git a/webrtc/common_audio/vad/Android.mk b/webrtc/common_audio/vad/Android.mk
index b7be3f0307..ed5de6b919 100644
--- a/webrtc/common_audio/vad/Android.mk
+++ b/webrtc/common_audio/vad/Android.mk
@@ -30,7 +30,8 @@ LOCAL_CFLAGS := \
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/include \
     $(LOCAL_PATH)/../.. \
-    $(LOCAL_PATH)/../signal_processing/include 
+    $(LOCAL_PATH)/../signal_processing/include \
+    external/webrtc
 
 LOCAL_SHARED_LIBRARIES := \
     libdl \
diff --git a/webrtc/modules/audio_processing/Android.mk b/webrtc/modules/audio_processing/Android.mk
index 1dffd754cf..201b23a0e6 100644
--- a/webrtc/modules/audio_processing/Android.mk
+++ b/webrtc/modules/audio_processing/Android.mk
@@ -50,7 +50,8 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../common_audio/signal_processing/include \
     $(LOCAL_PATH)/../../common_audio/vad/include \
     $(LOCAL_PATH)/../../system_wrappers/interface \
-    external/protobuf/src
+    external/protobuf/src \
+    external/webrtc
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
@@ -83,7 +84,8 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../interface \
     $(LOCAL_PATH)/../.. \
     $(LOCAL_PATH)/../../system_wrappers/interface \
-    external/gtest/include
+    external/gtest/include \
+    external/webrtc
 
 LOCAL_STATIC_LIBRARIES := \
     libgtest \
@@ -129,7 +131,8 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../system_wrappers/interface \
     $(LOCAL_PATH)/../../common_audio/signal_processing/include \
     external/gtest/include \
-    external/protobuf/src
+    external/protobuf/src \
+    external/webrtc
 
 LOCAL_STATIC_LIBRARIES := \
     libgtest \
diff --git a/webrtc/modules/audio_processing/aec/Android.mk b/webrtc/modules/audio_processing/aec/Android.mk
index 26679d8a2b..3ad52b9662 100644
--- a/webrtc/modules/audio_processing/aec/Android.mk
+++ b/webrtc/modules/audio_processing/aec/Android.mk
@@ -35,7 +35,8 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/include \
     $(LOCAL_PATH)/../utility \
     $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../../../common_audio/signal_processing/include
+    $(LOCAL_PATH)/../../../common_audio/signal_processing/include \
+    external/webrtc
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
diff --git a/webrtc/modules/audio_processing/aec/aec_core.c b/webrtc/modules/audio_processing/aec/aec_core.c
index 5e1ef003e0..1f3123f9a6 100644
--- a/webrtc/modules/audio_processing/aec/aec_core.c
+++ b/webrtc/modules/audio_processing/aec/aec_core.c
@@ -12,7 +12,7 @@
  * The core AEC algorithm, which is presented with time-aligned signals.
  */
 
-#include "aec_core.h"
+#include "webrtc/modules/audio_processing/aec/aec_core.h"
 
 #include <assert.h>
 #include <math.h>
@@ -20,12 +20,12 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "aec_rdft.h"
-#include "common_audio/signal_processing/include/signal_processing_library.h"
-#include "delay_estimator_wrapper.h"
-#include "ring_buffer.h"
-#include "system_wrappers/interface/cpu_features_wrapper.h"
-#include "typedefs.h"
+#include "webrtc/common_audio/signal_processing/include/signal_processing_library.h"
+#include "webrtc/modules/audio_processing/aec/aec_rdft.h"
+#include "webrtc/modules/audio_processing/utility/delay_estimator_wrapper.h"
+#include "webrtc/modules/audio_processing/utility/ring_buffer.h"
+#include "webrtc/system_wrappers/interface/cpu_features_wrapper.h"
+#include "webrtc/typedefs.h"
 
 // Buffer size (samples)
 static const size_t kBufSizePartitions = 250;  // 1 second of audio in 16 kHz.
diff --git a/webrtc/modules/audio_processing/aecm/Android.mk b/webrtc/modules/audio_processing/aecm/Android.mk
index d74ca5b629..fc11383a83 100644
--- a/webrtc/modules/audio_processing/aecm/Android.mk
+++ b/webrtc/modules/audio_processing/aecm/Android.mk
@@ -31,7 +31,8 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../utility \
     $(LOCAL_PATH)/../../.. \
     $(LOCAL_PATH)/../../../common_audio/signal_processing/include \
-    $(LOCAL_PATH)/../../../system_wrappers/interface
+    $(LOCAL_PATH)/../../../system_wrappers/interface \
+    external/webrtc
 
 LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers
 
@@ -81,7 +82,8 @@ LOCAL_C_INCLUDES := \
     $(AECM_ASM_HEADER_DIR) \
     $(LOCAL_PATH)/include \
     $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../../../common_audio/signal_processing/include
+    $(LOCAL_PATH)/../../../common_audio/signal_processing/include \
+    external/webrtc
 
 LOCAL_INCLUDES := $(LOCAL_C_INCLUDES)
 
diff --git a/webrtc/modules/audio_processing/agc/Android.mk b/webrtc/modules/audio_processing/agc/Android.mk
index 5eceb14059..35a7136594 100644
--- a/webrtc/modules/audio_processing/agc/Android.mk
+++ b/webrtc/modules/audio_processing/agc/Android.mk
@@ -27,7 +27,8 @@ LOCAL_CFLAGS := \
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/include \
     $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../../../common_audio/signal_processing/include
+    $(LOCAL_PATH)/../../../common_audio/signal_processing/include \
+    external/webrtc
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
diff --git a/webrtc/modules/audio_processing/ns/Android.mk b/webrtc/modules/audio_processing/ns/Android.mk
index 34c30e5eb1..70e337623e 100644
--- a/webrtc/modules/audio_processing/ns/Android.mk
+++ b/webrtc/modules/audio_processing/ns/Android.mk
@@ -33,7 +33,8 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../utility \
     $(LOCAL_PATH)/../../.. \
     $(LOCAL_PATH)/../../../common_audio/signal_processing/include \
-    $(LOCAL_PATH)/../../../system_wrappers/interface
+    $(LOCAL_PATH)/../../../system_wrappers/interface \
+    external/webrtc
 
 LOCAL_STATIC_LIBRARIES += libwebrtc_system_wrappers
 
@@ -82,7 +83,8 @@ LOCAL_C_INCLUDES := \
     $(NS_ASM_HEADER_DIR) \
     $(LOCAL_PATH)/include \
     $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../../../common_audio/signal_processing/include
+    $(LOCAL_PATH)/../../../common_audio/signal_processing/include \
+    external/webrtc
 
 LOCAL_INCLUDES := $(LOCAL_C_INCLUDES)
 
diff --git a/webrtc/modules/audio_processing/utility/Android.mk b/webrtc/modules/audio_processing/utility/Android.mk
index bd3d039eeb..5a4d309d58 100644
--- a/webrtc/modules/audio_processing/utility/Android.mk
+++ b/webrtc/modules/audio_processing/utility/Android.mk
@@ -30,7 +30,8 @@ LOCAL_CFLAGS := \
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH) \
     $(LOCAL_PATH)/../../.. \
-    $(LOCAL_PATH)/../../../common_audio/signal_processing/include
+    $(LOCAL_PATH)/../../../common_audio/signal_processing/include \
+    external/webrtc
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
diff --git a/webrtc/modules/utility/source/Android.mk b/webrtc/modules/utility/source/Android.mk
index 452a95bbb3..929bd7cee4 100644
--- a/webrtc/modules/utility/source/Android.mk
+++ b/webrtc/modules/utility/source/Android.mk
@@ -40,7 +40,8 @@ LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../../.. \
     $(LOCAL_PATH)/../../../common_video/vplib/main/interface \
     $(LOCAL_PATH)/../../../common_audio/resampler/include \
-    $(LOCAL_PATH)/../../../system_wrappers/interface 
+    $(LOCAL_PATH)/../../../system_wrappers/interface \
+    external/webrtc
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \
diff --git a/webrtc/system_wrappers/source/Android.mk b/webrtc/system_wrappers/source/Android.mk
index a23dbde311..7c77d49142 100644
--- a/webrtc/system_wrappers/source/Android.mk
+++ b/webrtc/system_wrappers/source/Android.mk
@@ -50,7 +50,8 @@ LOCAL_CFLAGS := \
 LOCAL_C_INCLUDES := \
     $(LOCAL_PATH)/../.. \
     $(LOCAL_PATH)/../interface \
-    $(LOCAL_PATH)/spreadsortlib
+    $(LOCAL_PATH)/spreadsortlib \
+    external/webrtc
 
 LOCAL_SHARED_LIBRARIES := \
     libcutils \