diff --git a/Makefile b/Makefile
index 14a733185..12cba7448 100644
--- a/Makefile
+++ b/Makefile
@@ -12,7 +12,10 @@ SQLITE_VERSION=3071700
 SQLITE_BASENAME=sqlite-amalgamation-$(SQLITE_VERSION)
 SQLITE_URL=http://www.sqlite.org/2013/$(SQLITE_BASENAME).zip
 
+#default options, can be overidden using make OPTION=value .
+
 NDK_DEBUG=0
+BUILD_VIDEO=1
 BUILD_UPNP=1
 BUILD_REMOTE_PROVISIONING=1
 BUILD_X264=0
@@ -167,7 +170,7 @@ prepare-sources: prepare-ffmpeg prepare-ilbc prepare-vpx prepare-silk prepare-sr
 LIBLINPHONE_OPTIONS = NDK_DEBUG=$(NDK_DEBUG) LINPHONE_VERSION=$(LINPHONE_VERSION) BUILD_UPNP=$(BUILD_UPNP) BUILD_REMOTE_PROVISIONING=$(BUILD_REMOTE_PROVISIONING) BUILD_X264=$(BUILD_X264) \
 				BUILD_AMRNB=$(BUILD_AMRNB) BUILD_AMRWB=$(BUILD_AMRWB) BUILD_GPLV3_ZRTP=$(BUILD_GPLV3_ZRTP) BUILD_SILK=$(BUILD_SILK) BUILD_G729=$(BUILD_G729) BUILD_TUNNEL=$(BUILD_TUNNEL) \
 				BUILD_WEBRTC_AECM=$(BUILD_WEBRTC_AECM) BUILD_FOR_X86=$(BUILD_FOR_X86) USE_JAVAH=$(USE_JAVAH) BUILD_TLS=$(BUILD_TLS) BUILD_SQLITE=$(BUILD_SQLITE) \
-				BELLESIP_VERSION=$(BELLESIP_VERSION) BUILD_OPUS=$(BUILD_OPUS) 
+				BELLESIP_VERSION=$(BELLESIP_VERSION) BUILD_OPUS=$(BUILD_OPUS) BUILD_VIDEO=$(BUILD_VIDEO)
 
 
 generate-libs: prepare-sources javah
diff --git a/jni/Android.mk b/jni/Android.mk
index f28c5128f..97ad3eb6a 100755
--- a/jni/Android.mk
+++ b/jni/Android.mk
@@ -1,28 +1,18 @@
 # script expect linphone-root-dir variable to be set by parent !
 
-#default values
-ifeq ($(BUILD_AMRNB),)
-BUILD_AMRNB=light
-endif
-ifeq ($(BUILD_AMRWB),)
-BUILD_AMRWB=0
-endif
-ifeq ($(BUILD_G729),)
-BUILD_G729=0
-endif
-BUILD_SRTP=1
-
-BUILD_X264=0
-LINPHONE_VIDEO=0
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
-BUILD_X264=1
-LINPHONE_VIDEO=1
-LINPHONE_HD_VIDEO=1
-endif
-
 include $(linphone-root-dir)/submodules/linphone/mediastreamer2/src/android/libneon/Android.mk
 
-##ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
+
+#disable video on non armv7 targets
+ifneq ($(TARGET_ARCH_ABI),armeabi-v7a)
+ifeq (,$(DUMP_VAR))
+$(info Video is disabled for other than armeabi-v7a)
+endif
+_BUILD_X264=0
+_BUILD_VIDEO=0
+endif
+
+
 ifeq ($(BUILD_GPLV3_ZRTP), 1)
 	BUILD_SRTP=1
 ZRTP_C_INCLUDE= \
@@ -35,7 +25,7 @@ SRTP_C_INCLUDE= \
 	$(linphone-root-dir)/submodules/externals/srtp/include \
 	$(linphone-root-dir)/submodules/externals/srtp/crypto/include
 endif
-#endif
+
 
 #sqlite
 ifeq ($(BUILD_SQLITE),1)
@@ -88,11 +78,11 @@ endif
 include $(linphone-root-dir)/submodules/mssilk/Android.mk
 endif
 
-
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 include $(linphone-root-dir)/submodules/msilbc/Android.mk
 
-ifeq ($(BUILD_X264), 1)
+ifeq ($(_BUILD_VIDEO),1)
+
+ifeq ($(_BUILD_X264),1)
 ifeq (,$(DUMP_VAR))
 $(info Build X264 plugin for mediastreamer2)
 endif
@@ -104,7 +94,7 @@ include $(linphone-root-dir)/submodules/externals/build/ffmpeg/Android.mk
 include $(linphone-root-dir)/submodules/externals/build/ffmpeg-no-neon/Android.mk
 
 include $(linphone-root-dir)/submodules/externals/build/libvpx/Android.mk
-endif #armeabi-v7a
+endif #_BUILD_VIDEO
 
 
 ifeq ($(BUILD_GPLV3_ZRTP), 1)
diff --git a/jni/Application.mk b/jni/Application.mk
index eb4892919..6551ed76d 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -2,6 +2,46 @@ APP_PROJECT_PATH := $(call my-dir)/../
 APP_MODULES      :=libspeex libgsm libortp antlr3 libbellesip libmediastreamer2 liblinphone liblinphonenoneon libneon liblpxml2
 APP_STL := stlport_static
 
+#default values:
+
+ifeq ($(BUILD_AMRNB),)
+BUILD_AMRNB=light
+endif
+
+ifeq ($(BUILD_AMRWB),)
+BUILD_AMRWB=0
+endif
+
+ifeq ($(BUILD_SRTP),)
+BUILD_SRTP=1
+endif
+
+ifeq ($(BUILD_X264),)
+BUILD_X264=0
+endif
+
+ifeq ($(BUILD_X264),)
+BUILD_X264=0
+endif
+
+ifeq ($(BUILD_G729),)
+BUILD_G729=0
+endif
+
+ifeq ($(BUILD_VIDEO),)
+BUILD_VIDEO=1
+endif
+
+#since we want to modify BUILD_VIDEO and BUILD_X264 depending on platform, we need to make a copy because the 
+#variables given on command line take precedence over the ones defined internally.
+ifeq ($(BUILD_VIDEO),1)
+_BUILD_VIDEO=1
+endif
+
+ifeq ($(BUILD_X264),1)
+_BUILD_X264=1
+endif
+
 #sqlite
 ifeq ($(BUILD_SQLITE),1)
 APP_MODULES += liblinsqlite
@@ -16,18 +56,7 @@ ifeq ($(BUILD_TLS),1)
 APP_MODULES +=polarssl
 endif
 
-#default values
-ifeq ($(BUILD_AMRNB),)
-BUILD_AMRNB=light
-endif
-ifeq ($(BUILD_AMRWB),)
-BUILD_AMRWB=0
-endif
-ifeq ($(BUILD_SRTP),)
-BUILD_SRTP=1
-endif
-
-ifeq ($(LINPHONE_VIDEO),1)
+ifeq ($(BUILD_VIDEO),1)
 APP_MODULES += liblinavutil liblinavcore liblinavcodec liblinswscale
 APP_MODULES += liblinavcodecnoneon
 APP_MODULES += libvpx
@@ -79,22 +108,16 @@ ifeq ($(BUILD_TUNNEL), 1)
 APP_MODULES += libtunnelclient
 endif
 
-ifeq ($(TARGET_ARCH_ABI),armeabi-v7a)
 ifeq ($(BUILD_GPLV3_ZRTP), 1)
 APP_MODULES += liblincrypto liblinssl
+APP_MODULES      += libzrtpcpp
 endif
 
 APP_MODULES      +=libmsilbc
 
-ifeq ($(BUILD_GPLV3_ZRTP), 1)
-APP_MODULES      += libzrtpcpp
-endif
-
 ifeq ($(BUILD_SRTP), 1)
 APP_MODULES      += libsrtp
 endif
-endif #armeabi-v7a
-
 
 linphone-root-dir:=$(APP_PROJECT_PATH)
 
diff --git a/submodules/linphone b/submodules/linphone
index 632f0ac00..a1ec7d696 160000
--- a/submodules/linphone
+++ b/submodules/linphone
@@ -1 +1 @@
-Subproject commit 632f0ac005b532e3a5d1b8ba3ef550df789b10ee
+Subproject commit a1ec7d69658b8b534a9c5b6ca446dddd82442b41