fix openssl recipe and tweak build

.gitlab-ci.yml

@@ -22,6 +22,7 @@ build apk:
     - rm -rf ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9
     - ln -s ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21 ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-9
     - cp -f $CI_PROJECT_DIR/scripts/build-target-python.sh ~/.buildozer/android/crystax-ndk-10.3.2/build/tools/build-target-python.sh
+    - cp -f $CI_PROJECT_DIR/scripts/mangled-glibc-syscalls.h ~/.buildozer/android/crystax-ndk-10.3.2/platforms/android-21/arch-arm/usr/include/crystax/bionic/libc/include/sys/mangled-glibc-syscalls.h
     - rm ~/.buildozer/android/crystax-ndk-10.3.2-linux-x86_64.tar.xz
     - git secret reveal
     - mv buildozer.spec.travis buildozer.spec

recipes/openssl/__init__.py

@@ -2,6 +2,7 @@ from functools import partial
 
 from pythonforandroid.recipe import Recipe
 from pythonforandroid.toolchain import shprint, current_directory
+from os.path import join
 import sh
 
 
@@ -60,8 +61,9 @@ class OpenSSLRecipe(Recipe):
             config_args.append(buildarch)
             shprint(perl, 'Configure', *config_args, _env=env)
             self.apply_patch('disable-sover.patch', arch.arch)
-            self.apply_patch('fix-cross-compile.patch', arch.arch)
 
+            makefile = join(self.get_build_dir(arch.arch), 'Makefile')
+            sh.sed('-i', 's/CROSS_COMPILE=arm-linux-androideabi-/CROSS_COMPILE=/g', makefile)
             shprint(sh.make, 'build_libs', _env=env)
 
             self.install_libs(arch, 'libssl.a', 'libssl' + self.version + '.so',

recipes/openssl/fix-cross-compile.patch

@@ -1,19 +0,0 @@
---- a/Makefile	2019-03-29 13:35:22.677487223 +0100
-+++ b/Makefile	2019-03-29 13:36:00.289935323 +0100
-@@ -85,14 +85,14 @@
- # and pass it down to assembler.  In any case, we do not define AS or
- # ASFLAGS for this reason.
- 
--CROSS_COMPILE=arm-linux-androideabi-
-+CROSS_COMPILE=
- CC=$(CROSS_COMPILE)/usr/bin/ccache arm-linux-androideabi-gcc -DANDROID -fomit-frame-pointer -D__ANDROID_API__=21 -mandroid -I/home/akinwale/Dev/SDKs/crystax-ndk-10.3.2/platforms/android-21/arch-arm -isysroot /home/akinwale/Dev/SDKs/crystax-ndk-10.3.2/platforms/android-21/arch-arm -I/home/akinwale/Dev/Python/lbry-android/.buildozer/android/platform/build/build/python-installs/browser/include/python3.7   --sysroot=/home/akinwale/Dev/SDKs/crystax-ndk-10.3.2/platforms/android-21/arch-arm -lm -L/home/akinwale/Dev/Python/lbry-android/.buildozer/android/platform/build/build/libs_collections/browser/armeabi-v7a -L/home/akinwale/Dev/SDKs/crystax-ndk-10.3.2/sources/crystax/libs/armeabi-v7a -lcrystax
- CXX=$(CROSS_COMPILE)/usr/bin/ccache arm-linux-androideabi-g++ -DANDROID -fomit-frame-pointer -D__ANDROID_API__=21 -mandroid -I/home/akinwale/Dev/SDKs/crystax-ndk-10.3.2/platforms/android-21/arch-arm -isysroot /home/akinwale/Dev/SDKs/crystax-ndk-10.3.2/platforms/android-21/arch-arm -I/home/akinwale/Dev/Python/lbry-android/.buildozer/android/platform/build/build/python-installs/browser/include/python3.7
- CPPFLAGS=
- CFLAGS=-DANDROID -fomit-frame-pointer -D__ANDROID_API__=21 -mandroid -I/home/akinwale/Dev/SDKs/crystax-ndk-10.3.2/platforms/android-21/arch-arm -isysroot /home/akinwale/Dev/SDKs/crystax-ndk-10.3.2/platforms/android-21/arch-arm -I/home/akinwale/Dev/Python/lbry-android/.buildozer/android/platform/build/build/python-installs/browser/include/python3.7 -I/home/akinwale/Dev/SDKs/crystax-ndk-10.3.2/sources/python/3.7/include/python/ -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -mthumb   --sysroot=/home/akinwale/Dev/SDKs/crystax-ndk-10.3.2/platforms/android-21/arch-arm -lm -L/home/akinwale/Dev/Python/lbry-android/.buildozer/android/platform/build/build/libs_collections/browser/armeabi-v7a -L/home/akinwale/Dev/SDKs/crystax-ndk-10.3.2/sources/crystax/libs/armeabi-v7a -lcrystax
- CXXFLAGS=-DANDROID -fomit-frame-pointer -D__ANDROID_API__=21 -mandroid -I/home/akinwale/Dev/SDKs/crystax-ndk-10.3.2/platforms/android-21/arch-arm -isysroot /home/akinwale/Dev/SDKs/crystax-ndk-10.3.2/platforms/android-21/arch-arm -I/home/akinwale/Dev/Python/lbry-android/.buildozer/android/platform/build/build/python-installs/browser/include/python3.7 -I/home/akinwale/Dev/SDKs/crystax-ndk-10.3.2/sources/python/3.7/include/python/ -march=armv7-a -mfloat-abi=softfp -mfpu=vfp -mthumb
- LDFLAGS=   --sysroot=/home/akinwale/Dev/SDKs/crystax-ndk-10.3.2/platforms/android-21/arch-arm -lm -L/home/akinwale/Dev/Python/lbry-android/.buildozer/android/platform/build/build/libs_collections/browser/armeabi-v7a -L/home/akinwale/Dev/SDKs/crystax-ndk-10.3.2/sources/crystax/libs/armeabi-v7a -lcrystax
--EX_LIBS= 
-+EX_LIBS=
- 
- MAKEDEPEND=
-