From 286081da792138af15b121513c07f7249845ef13 Mon Sep 17 00:00:00 2001
From: Jehan Monnier <jehan.monnier@linphone.org>
Date: Fri, 16 Jan 2015 11:16:44 +0100
Subject: [PATCH] update openh264

---
 Makefile                      | 10 +++++++++-
 jni/Application.mk            |  5 ++++-
 submodules/externals/openh264 |  2 +-
 submodules/msopenh264         |  2 +-
 4 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 22a170420..021a17959 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,5 @@
 NDK_PATH=$(shell dirname `which ndk-build`)
+NDK_MAJOR_VERSION=$(shell cat $(NDK_PATH)/RELEASE.TXT | sed "s/r\([0-9]\{1,2\}\).*/\1/")
 SDK_PATH=$(shell dirname `which android`)
 SDK_PLATFORM_TOOLS_PATH=$(shell dirname `which adb`)
 ARM_COMPILER_PATH=`find "$(NDK_PATH)" -name "arm-linux-androideabi-gcc-4*" -print | tail -1`
@@ -50,6 +51,7 @@ BUILD_OPUS=1
 BUILD_MATROSKA=1
 BUILD_WEBRTC_ISAC=1
 BUILD_FOR_X86=1
+BUILD_FOR_ARM=1
 USE_JAVAH=1
 BUILD_TLS=1
 BUILD_SQLITE=1
@@ -64,10 +66,16 @@ APP_STL=stlport_static
 
 # Checks
 CHECK_MSG=$(shell ./check_tools.sh)
+ifeq ($(BUILD_OPENH264),1)
+	ifneq ($(shell echo $(NDK_MAJOR_VERSION)\>=10 | bc),1)
+              $(error ndk version [$(NDK_MAJOR_VERSION)] not compatible with opensh264.)
+	endif
+endif
+include check_tools.mk
+
 ifneq ($(CHECK_MSG),)
     $(error Some tools are missing.)
 endif
-include check_tools.mk
 
 OPENSSL_DIR=$(shell openssl version -d | sed  "s/OPENSSLDIR: \"\(.*\)\"/\1/")
 ifneq ($(shell ls $(OPENSSL_DIR)/certs),)
diff --git a/jni/Application.mk b/jni/Application.mk
index dbecac68a..12959bb53 100644
--- a/jni/Application.mk
+++ b/jni/Application.mk
@@ -139,7 +139,10 @@ linphone-root-dir:=$(APP_PROJECT_PATH)
 
 APP_BUILD_SCRIPT:=$(call my-dir)/Android.mk
 APP_PLATFORM := android-8
-APP_ABI := armeabi-v7a armeabi
+APP_ABI := armeabi-v7a 
+ifeq ($(BUILD_FOR_ARM), 1)
+APP_ABI += armeabi
+endif
 ifeq ($(BUILD_FOR_X86), 1)
 APP_ABI += x86
 endif
diff --git a/submodules/externals/openh264 b/submodules/externals/openh264
index bdb7d758c..c13bfe640 160000
--- a/submodules/externals/openh264
+++ b/submodules/externals/openh264
@@ -1 +1 @@
-Subproject commit bdb7d758c1edce3c42c7fdc203328aae28f08008
+Subproject commit c13bfe6407252f64610b0c2c9aa0737054dcd71e
diff --git a/submodules/msopenh264 b/submodules/msopenh264
index 5ba043abf..6c2cf04b5 160000
--- a/submodules/msopenh264
+++ b/submodules/msopenh264
@@ -1 +1 @@
-Subproject commit 5ba043abf7c68fc2d3a36b3cfdb19dc19fd498c7
+Subproject commit 6c2cf04b56b226be7bbc4f0ebe47fe937806ac73