diff options
| author | Alexander Gutkin <agutkin@google.com> | 2012-09-17 08:53:18 +0100 |
|---|---|---|
| committer | Alexander Gutkin <agutkin@google.com> | 2012-09-18 10:56:58 +0100 |
| commit | a6451827d543eb00824bc95097e47d0aac51ae93 (patch) | |
| tree | 4a8cf6cf1ff19717bdbf501c94a899d83518bf93 /Android.mk | |
| parent | 6f12fff925188ced26e518cd2252aff3e93bb04e (diff) | |
| download | webrtc-a6451827d543eb00824bc95097e47d0aac51ae93.tar.gz | |
Added fixed point iSAC codec implementation.
- Added fixed-point iSAC audio codec implementation (from stable r2699).
- Updated system wrappers (from stable r2699).
- Some cosmetic makefile changes.
Change-Id: If75d503698c11a4e4ceb851529127aadfe52f255
Diffstat (limited to 'Android.mk')
| -rw-r--r-- | Android.mk | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/Android.mk b/Android.mk index a6e7a49671..7b046d67af 100644 --- a/Android.mk +++ b/Android.mk @@ -12,6 +12,8 @@ MY_WEBRTC_ROOT_PATH := $(call my-dir) 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_coding/codecs/isac/fix/source/Android.mk +include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/isac/main/source/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 @@ -20,7 +22,6 @@ 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 -include $(MY_WEBRTC_ROOT_PATH)/src/modules/audio_coding/codecs/isac/main/source/Android.mk # build .so LOCAL_PATH := $(call my-dir) @@ -75,9 +76,15 @@ LOCAL_MODULE_TAGS := optional LOCAL_WHOLE_STATIC_LIBRARIES := \ libwebrtc_isac \ + libwebrtc_isacfix \ libwebrtc_spl \ libwebrtc_system_wrappers +ifeq ($(WEBRTC_BUILD_NEON_LIBS),true) +LOCAL_WHOLE_STATIC_LIBRARIES += \ + libwebrtc_isacfix_neon +endif + LOCAL_STATIC_LIBRARIES := \ libprotobuf-cpp-2.3.0-lite |