From 1dc901b17ce8a50fe17bc7fd5f60ec67572b4142 Mon Sep 17 00:00:00 2001
From: Nanang Izzuddin <nanang@teluu.com>
Date: Thu, 26 Mar 2015 10:57:05 +0000
Subject: Re #1790: Fixed error build of undefined
 "ANativeWindow_fromSurface()" when video is disabled.

git-svn-id: http://svn.pjsip.org/repos/pjproject/trunk@5032 74dad513-b988-da41-8d7b-12977e46ad98
---
 pjsip-apps/src/pjsua/android/jni/pjsua.i | 7 ++++++-
 pjsip-apps/src/swig/pjsua2.i             | 8 +++++++-
 2 files changed, 13 insertions(+), 2 deletions(-)

diff --git a/pjsip-apps/src/pjsua/android/jni/pjsua.i b/pjsip-apps/src/pjsua/android/jni/pjsua.i
index a2c7ee38..28f76d7e 100755
--- a/pjsip-apps/src/pjsua/android/jni/pjsua.i
+++ b/pjsip-apps/src/pjsua/android/jni/pjsua.i
@@ -3,7 +3,12 @@
 %{
 #include "pjsua_app_callback.h"
 #include "../../pjsua_app.h"
-#include <android/native_window_jni.h>
+
+#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO!=0
+#  include <android/native_window_jni.h>
+#else
+#  define ANativeWindow_fromSurface(a,b) NULL
+#endif
 %}
 
 /* Turn on director wrapping PjsuaAppCallback */
diff --git a/pjsip-apps/src/swig/pjsua2.i b/pjsip-apps/src/swig/pjsua2.i
index 88637ae1..de49bed1 100644
--- a/pjsip-apps/src/swig/pjsua2.i
+++ b/pjsip-apps/src/swig/pjsua2.i
@@ -103,7 +103,13 @@ using namespace pj;
 
 /* pj::WindowHandle::setWindow() receives Surface object */
 #if defined(SWIGJAVA) && defined(__ANDROID__)
-%{#include <android/native_window_jni.h>%}
+%{
+#if defined(PJMEDIA_HAS_VIDEO) && PJMEDIA_HAS_VIDEO!=0
+#  include <android/native_window_jni.h>
+#else
+#  define ANativeWindow_fromSurface(a,b) NULL
+#endif
+%}
 %ignore pj::WindowHandle::display;
 %ignore pj::WindowHandle::window;
 %typemap(in) jobject surface {
-- 
cgit v1.2.3