Added patch for openssl build.

Author: Fischiii

Dockerfile

@@ -55,13 +55,13 @@ RUN echo "************ Installing C++ Support ************" \
     && sdkmanager 'cmake;3.6.4111459' 
 
 # NDK
-RUN echo "************ Installing Android NDK 17c ************" \
+RUN echo "************ Installing Android NDK 18b ************" \
     && wget --output-document=$HOME/ndk.zip -q \
-        "https://dl.google.com/android/repository/android-ndk-r17c-linux-x86_64.zip" \
+        "https://dl.google.com/android/repository/android-ndk-r18b-linux-x86_64.zip" \
     && mkdir -p $ANDROID_NDK_HOME \
     && unzip -q $HOME/ndk.zip -d $ANDROID_NDK_HOME  \
-    && mv $ANDROID_NDK_HOME/android-ndk-r17c/* $ANDROID_NDK_HOME \
-    && rm -f $HOME/ndk.zip && rm -d $ANDROID_NDK_HOME/android-ndk-r17c
+    && mv $ANDROID_NDK_HOME/android-ndk-r18b/* $ANDROID_NDK_HOME \
+    && rm -f $HOME/ndk.zip && rm -d $ANDROID_NDK_HOME/android-ndk-r18b
 
 RUN useradd build -m -u 112
 USER build

build-android.sh

@@ -93,8 +93,8 @@ function build_android_arch {
     fi
 
     export SYSROOT=$TOOLCHAIN_ROOT_PATH/sysroot
-    export CC="$NDK_TOOLCHAIN_BASENAME-gcc --sysroot=${SYSROOT}"
-    export CXX=$NDK_TOOLCHAIN_BASENAME-gcc++
+    export CC="$NDK_TOOLCHAIN_BASENAME-clang --sysroot=${SYSROOT}"
+    export CXX=$NDK_TOOLCHAIN_BASENAME-clang++
     export LINK=${CXX} 
     export LD=$NDK_TOOLCHAIN_BASENAME-ld
     export AR=$NDK_TOOLCHAIN_BASENAME-ar

common.sh

@@ -55,12 +55,15 @@ function unarchive() {
     ZIP_PATH=$2
     TARGET=$3
     TARGET_DIR=$4
-    
+
     if [ -d $TARGET_DIR ]; then
         echo "Remove unarchive target dir for $TARGET"
         rm -dr $TARGET_DIR
     fi
 
     echo "Unarchive sources for $TARGET..."
     (cd $BUILD_DIR; tar -zxf $ZIP_PATH; mv $EXTRACTED_NAME $TARGET_DIR;) || exit 29
+
+    echo "Applying Patch for cmake build."
+    patch $TARGET_DIR/Configure configure.patch
 }

configure.patch

@@ -0,0 +1,26 @@
+--- Configure	2018-11-20 14:44:48.000000000 +0100
++++ Configure_fix	2018-12-20 13:09:17.000000000 +0100
+@@ -471,10 +471,10 @@
+ "linux-alpha+bwx-ccc","ccc:-fast -readonly_strings -DL_ENDIAN::-D_REENTRANT:::SIXTY_FOUR_BIT_LONG RC4_CHAR RC4_CHUNK DES_INT DES_PTR DES_RISC1 DES_UNROLL:${alpha_asm}",
+ 
+ # Android: linux-* but without pointers to headers and libs.
+-"android","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"android-x86","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"android-armv7","gcc:-march=armv7-a -mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+-"android-mips","gcc:-mandroid -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"android","gcc:-I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${no_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"android-x86","gcc:-I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG ${x86_gcc_des} ${x86_gcc_opts}:".eval{my $asm=${x86_elf_asm};$asm=~s/:elf/:android/;$asm}.":dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"android-armv7","gcc:-march=armv7-a -I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -fomit-frame-pointer -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${armv4_asm}:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
++"android-mips","gcc:-I\$(ANDROID_DEV)/include -B\$(ANDROID_DEV)/lib -O3 -Wall::-D_REENTRANT::-ldl:BN_LLONG RC4_CHAR RC4_CHUNK DES_INT DES_UNROLL BF_PTR:${mips32_asm}:o32:dlfcn:linux-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+ 
+ #### *BSD [do see comment about ${BSDthreads} above!]
+ "BSD-generic32","gcc:-O3 -fomit-frame-pointer -Wall::${BSDthreads}:::BN_LLONG RC2_CHAR RC4_INDEX DES_INT DES_UNROLL:${no_asm}:dlfcn:bsd-gcc-shared:-fPIC::.so.\$(SHLIB_MAJOR).\$(SHLIB_MINOR)",
+@@ -2122,7 +2122,7 @@
+ 	    VALUE "ProductVersion", "$version\\0"
+ 	    // Optional:
+ 	    //VALUE "Comments", "\\0"
+-	    VALUE "LegalCopyright", "Copyright  © 1998-2005 The OpenSSL Project. Copyright © 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0"
++	    VALUE "LegalCopyright", "Copyright  � 1998-2005 The OpenSSL Project. Copyright � 1995-1998 Eric A. Young, Tim J. Hudson. All rights reserved.\\0"
+ 	    //VALUE "LegalTrademarks", "\\0"
+ 	    //VALUE "PrivateBuild", "\\0"
+ 	    //VALUE "SpecialBuild", "\\0"