diff --git a/webrtc/video_engine/test/android/jni/Android.mk b/webrtc/video_engine/test/android/jni/Android.mk index 8cbba64f8..0035f6654 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