Include linphonecore_jni.h only if USE_JAVAH is defined.

fe595857 · Ghislain MARY · 2d9549f1 · fe595857 · fe595857
Commit fe595857 authored Oct 25, 2012 by Ghislain MARY
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 0 deletions

build/android/common.mk build/android/common.mk +4 -0

coreapi/linphonecore_jni.cc coreapi/linphonecore_jni.cc +2 -0

No files found.
--- 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 \

--- 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>