Made WITH_MEDIACODEC configurable, use newer openssl

scripts/android-build-32.conf

@@ -16,6 +16,7 @@ WITH_FFMPEG=1
 BUILD_DEPS=1
 DEPS_ONLY=0
 NDK_TARGET=21
+WITH_MEDIACODEC=1
 
 JPEG_TAG=master
 OPENH264_TAG=v1.8.0  # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0

scripts/android-build-64.conf

@@ -16,6 +16,7 @@ WITH_FFMPEG=1
 BUILD_DEPS=1
 DEPS_ONLY=0
 NDK_TARGET=21
+WITH_MEDIACODEC=1
 
 JPEG_TAG=master
 OPENH264_TAG=v1.8.0  # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0

scripts/android-build-freerdp.sh

@@ -77,6 +77,12 @@ do
 done
 common_parse_arguments $REMAINING
 
+if [ -z ${WITH_MEDIACODEC+x} ];
+then
+    common_run echo "WITH_MEDIACODEC unset, defining WITH_MEDIACODEC=1"
+    WITH_MEDIACODEC=1
+fi
+
 # clean up top
 if [ -d $BUILD_SRC ];
 then
@@ -140,6 +146,14 @@ do
     else
         CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_OPENH264=OFF"
     fi
+
+    if [ $WITH_MEDIACODEC -ne 0 ];
+    then
+        CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_MEDIACODEC=ON"
+    else
+        CMAKE_CMD_ARGS="$CMAKE_CMD_ARGS -DWITH_MEDIACODEC=OFF"
+    fi
+
 	if [ $WITH_FFMPEG -ne 0 ];
     then
 		if [ $BUILD_DEPS -ne 0 ];

scripts/android-build-release.conf

@@ -16,6 +16,7 @@ WITH_FFMPEG=1
 BUILD_DEPS=1
 DEPS_ONLY=0
 NDK_TARGET=23
+WITH_MEDIACODEC=1
 
 JPEG_TAG=master
 OPENH264_TAG=v1.8.0  # NOTE: NDK r15c or earlier needed in --openh624-ndk for v1.8.0

scripts/android-build.conf

@@ -16,10 +16,11 @@ WITH_FFMPEG=0
 BUILD_DEPS=1
 DEPS_ONLY=0
 NDK_TARGET=21
+WITH_MEDIACODEC=1
 
 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.1n
+OPENSSL_TAG=openssl-1.1.1o
 FFMPEG_TAG=n4.4.1
 
 SRC_DIR=$SCRIPT_PATH/..