From 6ab92ed42dbc64baad724bb30b94ab93aade4f6e Mon Sep 17 00:00:00 2001 From: "leozwang@webrtc.org" Date: Tue, 30 Oct 2012 19:04:58 +0000 Subject: [PATCH] Check if opus exists when build test app on Android 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 --- webrtc/video_engine/test/android/jni/Android.mk | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/webrtc/video_engine/test/android/jni/Android.mk b/webrtc/video_engine/test/android/jni/Android.mk index 8cbba64f8f..0035f66545 100644 --- a/webrtc/video_engine/test/android/jni/Android.mk +++ b/webrtc/video_engine/test/android/jni/Android.mk @@ -120,17 +120,22 @@ LOCAL_SRC_FILES := \ $(MY_LIBS_PATH)/webrtc/modules/libisac_neon.a 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) LOCAL_MODULE := libopus LOCAL_SRC_FILES := \ $(MY_LIBS_PATH)/third_party/opus/libopus.a include $(PREBUILT_STATIC_LIBRARY) +endif +ifneq ($(wildcard jni/$(MY_LIBS_PATH)/webrtc/modules/libwebrtc_opus.a),) include $(CLEAR_VARS) LOCAL_MODULE := libwebrtc_opus LOCAL_SRC_FILES := \ $(MY_LIBS_PATH)/webrtc/modules/libwebrtc_opus.a include $(PREBUILT_STATIC_LIBRARY) +endif include $(CLEAR_VARS) LOCAL_MODULE := libvad