From 62544e0b8a35f7e604f2b7d49f9d38a66ab2da02 Mon Sep 17 00:00:00 2001
From: Armin Novak <armin.novak@thincast.com>
Date: Mon, 16 Jan 2017 15:23:11 +0100
Subject: [PATCH] Added android release build configurations.

---
 docs/README.android           |  9 +++++++++
 scripts/android-build-32.conf | 29 +++++++++++++++++++++++++++++
 scripts/android-build-64.conf | 29 +++++++++++++++++++++++++++++
 scripts/android-build.conf    |  2 +-
 4 files changed, 68 insertions(+), 1 deletion(-)
 create mode 100644 scripts/android-build-32.conf
 create mode 100644 scripts/android-build-64.conf

diff --git a/docs/README.android b/docs/README.android
index 02312d513..1e4ff67dc 100644
--- a/docs/README.android
+++ b/docs/README.android
@@ -45,6 +45,15 @@ Currently the default script builds for:
 When the script is finished the libraries are ready for android studio to
 be picked up in client/Android/Studio/freeRDPCore/src/main/jniLibs
 
+The default configuration build configuration can be found in
+./scripts/android-build.conf and is configured to provide debug builds.
+They are limited to API level 21 and above.
+
+If release binaries (and old android API support) are required, build 32 bit architectures with
+./scripts/android-build-freerdp.sh --ndk <ANDROID_NDK> --sdk <ANDROID_SDK> --conf ./scripts/android-build-32.conf
+and 64 bit architectures with
+./scripts/android-build-freerdp.sh --ndk <ANDROID_NDK> --sdk <ANDROID_SDK> --conf ./scripts/android-build-32.conf
+
 Building the APK (Android Studio)
 ================
 
diff --git a/scripts/android-build-32.conf b/scripts/android-build-32.conf
new file mode 100644
index 000000000..36e821e33
--- /dev/null
+++ b/scripts/android-build-32.conf
@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# Android build confguration
+#
+# Note: This is a simple configuration to build all
+#       architectures in one rush.
+#       Since android 64 bit support was introduced with NDK API 21
+#       this is the minimal common denominator.
+#       If you require support for older NDK API levels,
+#       create seperate configurations for each NDK API level
+#       and architecture you want to support.
+WITH_JPEG=0
+WITH_OPENH264=1
+WITH_OPENSSL=1
+BUILD_DEPS=1
+DEPS_ONLY=0
+NDK_TARGET=14
+
+JPEG_TAG=master
+OPENH264_TAG=v1.6.0
+OPENSSL_TAG=OpenSSL_1_1_0c
+
+SRC_DIR=$SCRIPT_PATH/..
+BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs
+BUILD_SRC=$SRC_DIR/build
+
+CMAKE_BUILD_TYPE=Release
+
+BUILD_ARCH="armeabi armeabi-v7a x86 mips"
diff --git a/scripts/android-build-64.conf b/scripts/android-build-64.conf
new file mode 100644
index 000000000..aafe72fe9
--- /dev/null
+++ b/scripts/android-build-64.conf
@@ -0,0 +1,29 @@
+#!/bin/bash
+#
+# Android build confguration
+#
+# Note: This is a simple configuration to build all
+#       architectures in one rush.
+#       Since android 64 bit support was introduced with NDK API 21
+#       this is the minimal common denominator.
+#       If you require support for older NDK API levels,
+#       create seperate configurations for each NDK API level
+#       and architecture you want to support.
+WITH_JPEG=0
+WITH_OPENH264=1
+WITH_OPENSSL=1
+BUILD_DEPS=1
+DEPS_ONLY=0
+NDK_TARGET=21
+
+JPEG_TAG=master
+OPENH264_TAG=v1.6.0
+OPENSSL_TAG=OpenSSL_1_1_0c
+
+SRC_DIR=$SCRIPT_PATH/..
+BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs
+BUILD_SRC=$SRC_DIR/build
+
+CMAKE_BUILD_TYPE=Release
+
+BUILD_ARCH="arm64-v8a x86_64 mips64"
diff --git a/scripts/android-build.conf b/scripts/android-build.conf
index 4d9260613..510028e9b 100644
--- a/scripts/android-build.conf
+++ b/scripts/android-build.conf
@@ -10,7 +10,7 @@
 #       create seperate configurations for each NDK API level
 #       and architecture you want to support.
 WITH_JPEG=0
-WITH_OPENH264=0
+WITH_OPENH264=1
 WITH_OPENSSL=1
 BUILD_DEPS=1
 DEPS_ONLY=0