From 1f12b2af6fa02c78de355e558ebcf902fe8ed6c9 Mon Sep 17 00:00:00 2001
From: Armin Novak <armin.novak@thincast.com>
Date: Wed, 17 Jan 2018 15:23:19 +0100
Subject: [PATCH] Updated to OpenH264 1.7 and relocatable binaries.

---
 scripts/android-build-32.conf     | 2 +-
 scripts/android-build-64.conf     | 2 +-
 scripts/android-build-openh264.sh | 2 +-
 scripts/android-build.conf        | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/scripts/android-build-32.conf b/scripts/android-build-32.conf
index c2c43d571..ad02e651d 100644
--- a/scripts/android-build-32.conf
+++ b/scripts/android-build-32.conf
@@ -17,7 +17,7 @@ DEPS_ONLY=0
 NDK_TARGET=14
 
 JPEG_TAG=master
-OPENH264_TAG=v1.6.0
+OPENH264_TAG=v1.7.0
 OPENSSL_TAG=OpenSSL_1_1_0c
 
 SRC_DIR=$SCRIPT_PATH/..
diff --git a/scripts/android-build-64.conf b/scripts/android-build-64.conf
index c7f6e81da..91c8a7d3a 100644
--- a/scripts/android-build-64.conf
+++ b/scripts/android-build-64.conf
@@ -17,7 +17,7 @@ DEPS_ONLY=0
 NDK_TARGET=21
 
 JPEG_TAG=master
-OPENH264_TAG=v1.6.0
+OPENH264_TAG=v1.7.0
 OPENSSL_TAG=OpenSSL_1_1_0c
 
 SRC_DIR=$SCRIPT_PATH/..
diff --git a/scripts/android-build-openh264.sh b/scripts/android-build-openh264.sh
index 76afe5f61..f90d9e3e0 100755
--- a/scripts/android-build-openh264.sh
+++ b/scripts/android-build-openh264.sh
@@ -9,7 +9,7 @@ function build {
 	BASE=$(pwd)
 	common_run cd $BUILD_SRC
 	PATH=$ANDROID_NDK:$PATH
-	MAKE="make PATH=$PATH OS=android NDKROOT=$ANDROID_NDK TARGET=android-$2 NDKLEVEL=$2 ARCH=$1 -j libraries"
+	MAKE="make PATH=$PATH ENABLEPIC=Yes OS=android NDKROOT=$ANDROID_NDK TARGET=android-$2 NDKLEVEL=$2 ARCH=$1 -j libraries"
 	common_run git clean -xdf
 	common_run export QUIET_AR="$CCACHE "
 	common_run export QUIET_ASM="$CCACHE "
diff --git a/scripts/android-build.conf b/scripts/android-build.conf
index 04ad66a09..571b5ffae 100644
--- a/scripts/android-build.conf
+++ b/scripts/android-build.conf
@@ -17,7 +17,7 @@ DEPS_ONLY=0
 NDK_TARGET=21
 
 JPEG_TAG=master
-OPENH264_TAG=v1.6.0
+OPENH264_TAG=v1.7.0
 OPENSSL_TAG=OpenSSL_1_1_0e
 
 SRC_DIR=$SCRIPT_PATH/..