Fix #6565: streamline android build configuration

(cherry picked from commit 0270932d96b6dd9a6c6c57e6c48eb5081fd122ef)

diff --git a/scripts/android-build-32.conf b/scripts/android-build-32.conf
index 8d15d0e..6b6ac79 100644 (file)
--- a/scripts/android-build-32.conf
+++ b/scripts/android-build-32.conf
@@ -10,15 +10,15 @@
 #       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
-NDK_TARGET=14
+NDK_TARGET=21
 
 JPEG_TAG=master
-OPENH264_TAG=v1.8.0
-OPENSSL_TAG=OpenSSL_1_1_1f
+OPENH264_TAG=v1.8.0  # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
+OPENSSL_TAG=OpenSSL_1_1_1h
 
 SRC_DIR=$SCRIPT_PATH/..
 BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs

diff --git a/scripts/android-build-64.conf b/scripts/android-build-64.conf
index 45e4136..7a59a47 100644 (file)
--- a/scripts/android-build-64.conf
+++ b/scripts/android-build-64.conf
@@ -10,15 +10,15 @@
 #       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
 NDK_TARGET=21
 
 JPEG_TAG=master
-OPENH264_TAG=v1.8.0
-OPENSSL_TAG=OpenSSL_1_1_1f
+OPENH264_TAG=v1.8.0  # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
+OPENSSL_TAG=OpenSSL_1_1_1h
 
 SRC_DIR=$SCRIPT_PATH/..
 BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs

diff --git a/scripts/android-build-freerdp.sh b/scripts/android-build-freerdp.sh
index b27fa6c..ebb7612 100755 (executable)
--- a/scripts/android-build-freerdp.sh
+++ b/scripts/android-build-freerdp.sh
@@ -37,6 +37,11 @@ do
                        WITH_OPENH264=1
                        shift
                        ;;
+               --openh264-ndk)
+                       shift
+                       ANDROID_NDK_OPENH264=$1
+                       shift
+                       ;;
                --openssl)
                        WITH_OPENSSL=1
                        shift
@@ -107,11 +112,19 @@ do
     fi
     if [ $WITH_OPENH264 -ne 0 ];
     then
+        if [ -z "$ANDROID_NDK_OPENH264" ]
+        then
+            echo
+            echo "Warning: Missing openh264-ndk, using $ANDROID_NDK" >&2
+            echo
+            ANDROID_NDK_OPENH264=$ANDROID_NDK
+        fi
         if [ $BUILD_DEPS -ne 0 ];
         then
             common_run bash $SCRIPT_PATH/android-build-openh264.sh \
                 --src $BUILD_SRC/openh264 --dst $BUILD_DST \
-                --ndk $ANDROID_NDK \
+                --sdk "$ANDROID_SDK" \
+                --ndk "$ANDROID_NDK_OPENH264" \
                 --arch $ARCH \
                 --target $NDK_TARGET \
                 --tag $OPENH264_TAG
@@ -126,6 +139,7 @@ do
         then
             common_run bash $SCRIPT_PATH/android-build-openssl.sh \
                 --src $BUILD_SRC/openssl --dst $BUILD_DST \
+                --sdk "$ANDROID_SDK" \
                 --ndk $ANDROID_NDK \
                 --arch $ARCH \
                --target $NDK_TARGET \

diff --git a/scripts/android-build-release.conf b/scripts/android-build-release.conf
new file mode 100644 (file)
index 0000000..e3a77bd
--- /dev/null
+++ b/scripts/android-build-release.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=26
+
+JPEG_TAG=master
+OPENH264_TAG=v1.8.0  # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
+OPENSSL_TAG=OpenSSL_1_1_1h
+
+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-v7a x86 arm64-v8a x86_64"

diff --git a/scripts/android-build.conf b/scripts/android-build.conf
index cd07da0..b69de86 100644 (file)
--- a/scripts/android-build.conf
+++ b/scripts/android-build.conf
@@ -10,15 +10,15 @@
 #       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
 NDK_TARGET=26
 
 JPEG_TAG=master
-OPENH264_TAG=v1.8.0
-OPENSSL_TAG=OpenSSL_1_1_1f
+OPENH264_TAG=v1.8.0  # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0
+OPENSSL_TAG=OpenSSL_1_1_1h
 
 SRC_DIR=$SCRIPT_PATH/..
 BUILD_DST=$SCRIPT_PATH/../client/Android/Studio/freeRDPCore/src/main/jniLibs