generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Check if opus exists when build test app on Android

Browse Source 
BUG=None
TEST=trybots
Review URL: https://webrtc-codereview.appspot.com/933011

git-svn-id: http://webrtc.googlecode.com/svn/trunk@3022 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
leozwang@webrtc.org 2012-10-30 19:04:58 +00:00
parent c381a8487a
commit 6ab92ed42d
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
webrtc/video_engine/test/android/jni/Android.mk
View File

@ -120,17 +120,22 @@ LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/webrtc/modules/libisac_neon.a $(MY_LIBS_PATH)/webrtc/modules/libisac_neon.a
include $(PREBUILT_STATIC_LIBRARY) include $(PREBUILT_STATIC_LIBRARY)
# Remove the following file existense check when opus is always enabled.
ifneq ($(wildcard jni/$(MY_LIBS_PATH)/third_party/opus/libopus.a),)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libopus LOCAL_MODULE := libopus
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/third_party/opus/libopus.a $(MY_LIBS_PATH)/third_party/opus/libopus.a
include $(PREBUILT_STATIC_LIBRARY) include $(PREBUILT_STATIC_LIBRARY)
endif
ifneq ($(wildcard jni/$(MY_LIBS_PATH)/webrtc/modules/libwebrtc_opus.a),)
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libwebrtc_opus LOCAL_MODULE := libwebrtc_opus
LOCAL_SRC_FILES := \ LOCAL_SRC_FILES := \
$(MY_LIBS_PATH)/webrtc/modules/libwebrtc_opus.a $(MY_LIBS_PATH)/webrtc/modules/libwebrtc_opus.a
include $(PREBUILT_STATIC_LIBRARY) include $(PREBUILT_STATIC_LIBRARY)
endif
include $(CLEAR_VARS) include $(CLEAR_VARS)
LOCAL_MODULE := libvad LOCAL_MODULE := libvad