zqz/platform-external-webrtc
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
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
This commit is contained in:
leozwang@webrtc.org
2012-11-15 18:17:40 +00:00
parent 0f4185f8bb
commit f3adba499e
11 changed files with 37 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
webrtc/modules/audio_processing/Android.mk
View File

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

3
webrtc/modules/audio_processing/aec/Android.mk
View File

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

14
webrtc/modules/audio_processing/aec/aec_core.c
View File

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

6
webrtc/modules/audio_processing/aecm/Android.mk
View File

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

3
webrtc/modules/audio_processing/agc/Android.mk
View File

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

6
webrtc/modules/audio_processing/ns/Android.mk
View File

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

3
webrtc/modules/audio_processing/utility/Android.mk
View File

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