update to latest stretch, update ndk to r19c, remove unnecessary armv…

…7 ldflags

.gitlab-ci.yml

@@ -1,5 +1,5 @@
 linux_release:
-  image: greenaddress/wallycore@sha256:ab55c35391af5e762a22db9f532b995b908a12c1bcbce911c528514b0f7295a1
+  image: greenaddress/wallycore@sha256:c6a2a3546b3ebe8db6ab0e78188c92d4cfc1f710c4b3334555dc45dfbf28faaa
   artifacts:
     expire_in: 1 day
     name: wallycore-bindings
@@ -19,7 +19,7 @@ linux_release:
     - gzip -9 wally_dist/wallycore-android-jni.tar
 
 linux_py2_debug:
-  image: greenaddress/wallycore@sha256:ab55c35391af5e762a22db9f532b995b908a12c1bcbce911c528514b0f7295a1
+  image: greenaddress/wallycore@sha256:c6a2a3546b3ebe8db6ab0e78188c92d4cfc1f710c4b3334555dc45dfbf28faaa
   tags:
     - ga
   script:
@@ -29,7 +29,7 @@ linux_py2_debug:
     - DEBUG_WALLY=--enable-debug ./tools/build_js_bindings.sh
 
 linux_py3_debug:
-  image: greenaddress/wallycore@sha256:ab55c35391af5e762a22db9f532b995b908a12c1bcbce911c528514b0f7295a1
+  image: greenaddress/wallycore@sha256:c6a2a3546b3ebe8db6ab0e78188c92d4cfc1f710c4b3334555dc45dfbf28faaa
   tags:
     - ga
   script:
@@ -124,7 +124,7 @@ windows10_release:
     - tools\msvc\wheel.bat
 
 apidocs:
-  image: greenaddress/wallycore@sha256:ab55c35391af5e762a22db9f532b995b908a12c1bcbce911c528514b0f7295a1
+  image: greenaddress/wallycore@sha256:c6a2a3546b3ebe8db6ab0e78188c92d4cfc1f710c4b3334555dc45dfbf28faaa
   artifacts:
     expire_in: 14 days
     name: wallycore-apidocs

contrib/Dockerfile

@@ -1,6 +1,6 @@
-FROM debian:stretch@sha256:21ac5961a3038a839f6fa92ec4583c90f9eb6ca8f580598cde19d35d0f4d8fa6
+FROM debian:stretch@sha256:72e996751fe42b2a0c1e6355730dc2751ccda50564fec929f76804a6365ef5ef
 COPY stretch_deps.sh /deps.sh
 RUN /deps.sh && rm /deps.sh
 VOLUME /wallycore
 ENV JAVA_HOME=/usr/lib/jvm/java-1.8.0-openjdk-amd64
-ENV ANDROID_NDK=/opt/android-ndk-r19
+ENV ANDROID_NDK=/opt/android-ndk-r19c

contrib/stretch_deps.sh

@@ -1,7 +1,7 @@
 #! /usr/bin/env bash
 set -e
 
-export NDK_FILENAME=android-ndk-r19-linux-x86_64.zip
+export NDK_FILENAME=android-ndk-r19c-linux-x86_64.zip
 
 dpkg --add-architecture i386
 

tools/android_helpers.sh

@@ -18,17 +18,6 @@ function android_get_cflags() {
     echo $cflags
 }
 
-# Get the linker flags needed to build for Android
-# arch:     An architecture from android_get_arch_list()
-function android_get_ldflags() {
-    local arch=$1
-    local ldflags="$LDFLAGS"
-    case $arch in
-       armeabi-v7a) ldflags="$ldflags -Wl,--fix-cortex-a8";;
-    esac
-    echo $ldflags
-}
-
 # Get the configure flags needed to build for Android
 # arch:     An architecture from android_get_arch_list()
 # toolsdir: The directory for the NDK toolchain
@@ -70,7 +59,6 @@ function android_build_wally() {
     export CC=$(ls $toolsdir/bin/$clangarchname-linux-android*$api-clang)
 
     export CFLAGS=$(android_get_cflags $arch $toolsdir)
-    export LDFLAGS=$(android_get_ldflags $arch)
 
     PATH="$toolsdir/bin:$PATH" ./configure $(android_get_configure_flags $arch $toolsdir $useropts)
     local num_jobs=4