Skip to content

Commit 97524bd

Browse files
committed
update to latest stretch, update ndk to r19c, remove unnecessary armv7 ldflags
1 parent d5a3243 commit 97524bd

File tree

4 files changed

+7
-19
lines changed

4 files changed

+7
-19
lines changed

Diff for: .gitlab-ci.yml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
linux_release:
2-
image: greenaddress/wallycore@sha256:ab55c35391af5e762a22db9f532b995b908a12c1bcbce911c528514b0f7295a1
2+
image: greenaddress/wallycore@sha256:c6a2a3546b3ebe8db6ab0e78188c92d4cfc1f710c4b3334555dc45dfbf28faaa
33
artifacts:
44
expire_in: 1 day
55
name: wallycore-bindings
@@ -19,7 +19,7 @@ linux_release:
1919
- gzip -9 wally_dist/wallycore-android-jni.tar
2020

2121
linux_py2_debug:
22-
image: greenaddress/wallycore@sha256:ab55c35391af5e762a22db9f532b995b908a12c1bcbce911c528514b0f7295a1
22+
image: greenaddress/wallycore@sha256:c6a2a3546b3ebe8db6ab0e78188c92d4cfc1f710c4b3334555dc45dfbf28faaa
2323
tags:
2424
- ga
2525
script:
@@ -29,7 +29,7 @@ linux_py2_debug:
2929
- DEBUG_WALLY=--enable-debug ./tools/build_js_bindings.sh
3030

3131
linux_py3_debug:
32-
image: greenaddress/wallycore@sha256:ab55c35391af5e762a22db9f532b995b908a12c1bcbce911c528514b0f7295a1
32+
image: greenaddress/wallycore@sha256:c6a2a3546b3ebe8db6ab0e78188c92d4cfc1f710c4b3334555dc45dfbf28faaa
3333
tags:
3434
- ga
3535
script:
@@ -124,7 +124,7 @@ windows10_release:
124124
- tools\msvc\wheel.bat
125125

126126
apidocs:
127-
image: greenaddress/wallycore@sha256:ab55c35391af5e762a22db9f532b995b908a12c1bcbce911c528514b0f7295a1
127+
image: greenaddress/wallycore@sha256:c6a2a3546b3ebe8db6ab0e78188c92d4cfc1f710c4b3334555dc45dfbf28faaa
128128
artifacts:
129129
expire_in: 14 days
130130
name: wallycore-apidocs

Diff for: contrib/Dockerfile

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

Diff for: contrib/stretch_deps.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
#! /usr/bin/env bash
22
set -e
33

4-
export NDK_FILENAME=android-ndk-r19-linux-x86_64.zip
4+
export NDK_FILENAME=android-ndk-r19c-linux-x86_64.zip
55

66
dpkg --add-architecture i386
77

Diff for: tools/android_helpers.sh

-12
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,6 @@ function android_get_cflags() {
1818
echo $cflags
1919
}
2020

21-
# Get the linker flags needed to build for Android
22-
# arch: An architecture from android_get_arch_list()
23-
function android_get_ldflags() {
24-
local arch=$1
25-
local ldflags="$LDFLAGS"
26-
case $arch in
27-
armeabi-v7a) ldflags="$ldflags -Wl,--fix-cortex-a8";;
28-
esac
29-
echo $ldflags
30-
}
31-
3221
# Get the configure flags needed to build for Android
3322
# arch: An architecture from android_get_arch_list()
3423
# toolsdir: The directory for the NDK toolchain
@@ -70,7 +59,6 @@ function android_build_wally() {
7059
export CC=$(ls $toolsdir/bin/$clangarchname-linux-android*$api-clang)
7160

7261
export CFLAGS=$(android_get_cflags $arch $toolsdir)
73-
export LDFLAGS=$(android_get_ldflags $arch)
7462

7563
PATH="$toolsdir/bin:$PATH" ./configure $(android_get_configure_flags $arch $toolsdir $useropts)
7664
local num_jobs=4

0 commit comments

Comments
 (0)