Include linphonecore_jni.h only if USE_JAVAH is defined.

diff --git a/build/android/common.mk b/build/android/common.mk
index 8772e90035fe47f48ab6d3478d1f67c8cabbd45c..c49d511bd8aede81a472ce8a9c434725e87d666b 100644 (file)
--- 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 69f9b3cc4184183ed8dc4b47adf18d6aaffb8272..5ebf578925441dab517cc81bcee115d93425cfc6 100644 (file)
--- 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>