diff options
| author | Eric Laurent <elaurent@google.com> | 2012-01-31 14:20:52 -0800 |
|---|---|---|
| committer | Eric Laurent <elaurent@google.com> | 2012-02-02 08:57:35 -0800 |
| commit | c55a96383497a772a307b346368133960b02ad03 (patch) | |
| tree | 43b7aaa9cf8b8d42d0d58e123d27e37ad96607a5 /Android.mk | |
| parent | 4b6dc1ec58105d17dc8c2f550124cc0621dc93b7 (diff) | |
| download | webrtc-c55a96383497a772a307b346368133960b02ad03.tar.gz | |
update to webrtc revision 1349
Updated audio processing modules from revision 180 to 1349.
Main changes are:
- code clean up and reformating
- source path reorganization
- improved performance
Also imported test code that was not included in initial
drop from webrtc.
Change-Id: Ie4eb0e29990052e5f2d7f0b271b42eead40dbb6a
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 67 |
1 files changed, 52 insertions, 15 deletions
diff --git a/Android.mk b/Android.mk index aa90dd352a..dc214e9768 100644 --- a/Android.mk +++ b/Android.mk @@ -8,23 +8,60 @@ MY_WEBRTC_ROOT_PATH := $(call my-dir) - +# voice +include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/resampler/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/signal_processing/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/vad/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aec/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aecm/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/agc/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/ns/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/utility/Android.mk +#include $(MY_WEBRTC_ROOT_PATH)/src/modules/utility/source/Android.mk include $(MY_WEBRTC_ROOT_PATH)/src/system_wrappers/source/Android.mk -# audio processing -include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/resampler/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/signal_processing_library/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/common_audio/vad/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aec/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/aecm/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/agc/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/ns/main/source/Android.mk -include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/utility/Android.mk +# build .so +LOCAL_PATH := $(call my-dir) +include $(CLEAR_VARS) +include $(LOCAL_PATH)/../../external/webrtc/android-webrtc.mk -# build .so -include $(MY_WEBRTC_ROOT_PATH)/android-webrtc.mk +LOCAL_ARM_MODE := arm +LOCAL_MODULE := libwebrtc_audio_preprocessing +LOCAL_MODULE_TAGS := optional + +LOCAL_WHOLE_STATIC_LIBRARIES := \ + libwebrtc_spl \ + libwebrtc_resampler \ + libwebrtc_apm \ + libwebrtc_apm_utility \ + libwebrtc_vad \ + libwebrtc_ns \ + libwebrtc_agc \ + libwebrtc_aec \ + libwebrtc_aecm \ + libwebrtc_system_wrappers + +# Add Neon libraries. +ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) +LOCAL_WHOLE_STATIC_LIBRARIES += \ + libwebrtc_aecm_neon \ + libwebrtc_ns_neon +endif + +LOCAL_STATIC_LIBRARIES := \ + libprotobuf-cpp-2.3.0-lite + +LOCAL_SHARED_LIBRARIES := \ + libcutils \ + libdl \ + libstlport + +LOCAL_PRELINK_MODULE := false + +ifndef NDK_ROOT +include external/stlport/libstlport.mk +endif +include $(BUILD_SHARED_LIBRARY) -# build test apps -include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_processing/main/test/process_test/Android.mk |