From fe595857dddfadb85df51af67620f035e7651c7d Mon Sep 17 00:00:00 2001
From: Ghislain MARY <ghislain.mary@belledonne-communications.com>
Date: Thu, 25 Oct 2012 15:48:53 +0200
Subject: [PATCH] Include linphonecore_jni.h only if USE_JAVAH is defined.

---
 build/android/common.mk     | 4 ++++
 coreapi/linphonecore_jni.cc | 2 ++
 2 files changed, 6 insertions(+)

diff --git a/build/android/common.mk b/build/android/common.mk
index 8772e9003..c49d511bd 100644
--- a/build/android/common.mk
+++ b/build/android/common.mk
@@ -75,6 +75,10 @@ LOCAL_CFLAGS += -DHAVE_X264
 endif
 endif
 
+ifeq ($(USE_JAVAH),1)
+LOCAL_CFLAGS += -DUSE_JAVAH
+endif
+
 LOCAL_C_INCLUDES += \
 	$(LOCAL_PATH) \
 	$(LOCAL_PATH)/include \
diff --git a/coreapi/linphonecore_jni.cc b/coreapi/linphonecore_jni.cc
index 69f9b3cc4..5ebf57892 100644
--- a/coreapi/linphonecore_jni.cc
+++ b/coreapi/linphonecore_jni.cc
@@ -17,7 +17,9 @@ along with this program; if not, write to the Free Software
 Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
  */
 #include <jni.h>
+#ifdef USE_JAVAH
 #include "linphonecore_jni.h"
+#endif
 #include "linphonecore_utils.h"
 #include <ortp/zrtp.h>