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

Change audio_processing libraries because of r2723

Browse Source 
Buildbot will be ready soon, so such problem will hopefully not happen again.

BUG=None
TEST=local test
Review URL: https://webrtc-codereview.appspot.com/782004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@2724 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@webrtc.org
2012-09-08 23:26:16 +00:00
parent 8c4696cd76
commit a96f8d9584
1 changed files with 10 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
src/video_engine/main/test/android_test/jni/Android.mk
View File

@ -58,6 +58,12 @@ LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/src/modules/libaudio_processing.a $(MY_LIBS_PATH)/src/modules/libaudio_processing.a
include $(PREBUILT_STATIC_LIBRARY) include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libaudio_processing_neon
LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/src/modules/libaudio_processing_neon.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libPCM16B LOCAL_MODULE := libPCM16B
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
@ -118,48 +124,6 @@ LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/src/common_audio/libvad.a $(MY_LIBS_PATH)/src/common_audio/libvad.a
include $(PREBUILT_STATIC_LIBRARY) include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libns
LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/src/modules/libns.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libns_fix
LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/src/modules/libns_fix.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libns_neon
LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/src/modules/libns_neon.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libagc
LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/src/modules/libagc.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libaec
LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/src/modules/libaec.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libaecm
LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/src/modules/libaecm.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS)
LOCAL_MODULE := libaecm_neon
LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/src/modules/libaecm_neon.a
include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libbitrate_controller LOCAL_MODULE := libbitrate_controller
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
@ -179,9 +143,9 @@ LOCAL_SRC_FILES := \
include $(PREBUILT_STATIC_LIBRARY) include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libapm_util LOCAL_MODULE := libsignal_processing_neon
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/src/modules/libapm_util.a $(MY_LIBS_PATH)/src/common_audio/libsignal_processing_neon.a
include $(PREBUILT_STATIC_LIBRARY) include $(PREBUILT_STATIC_LIBRARY)
include $(CLEAR_VARS) include $(CLEAR_VARS)
@ -322,6 +286,7 @@ LOCAL_STATIC_LIBRARIES := \
libvideo_capture_module \ libvideo_capture_module \
libaudio_coding_module \ libaudio_coding_module \
libaudio_processing \ libaudio_processing \
libaudio_processing_neon \
libPCM16B \ libPCM16B \
libCNG \ libCNG \
libNetEq \ libNetEq \
@ -332,17 +297,10 @@ LOCAL_STATIC_LIBRARIES := \
libiSACFix \ libiSACFix \
libisac_neon \ libisac_neon \
libvad \ libvad \
libns \
libns_fix \
libns_neon \
libagc \
libaec \
libaecm \
libaecm_neon \
libbitrate_controller \ libbitrate_controller \
libresampler \ libresampler \
libsignal_processing \ libsignal_processing \
libapm_util \ libsignal_processing_neon \
libsystem_wrappers \ libsystem_wrappers \
libcpu_features_android \ libcpu_features_android \
libaudio_device \ libaudio_device \