File tree 4 files changed +7
-19
lines changed
4 files changed +7
-19
lines changed Original file line number Diff line number Diff line change 1
1
linux_release :
2
- image : greenaddress/wallycore@sha256:ab55c35391af5e762a22db9f532b995b908a12c1bcbce911c528514b0f7295a1
2
+ image : greenaddress/wallycore@sha256:c6a2a3546b3ebe8db6ab0e78188c92d4cfc1f710c4b3334555dc45dfbf28faaa
3
3
artifacts :
4
4
expire_in : 1 day
5
5
name : wallycore-bindings
@@ -19,7 +19,7 @@ linux_release:
19
19
- gzip -9 wally_dist/wallycore-android-jni.tar
20
20
21
21
linux_py2_debug :
22
- image : greenaddress/wallycore@sha256:ab55c35391af5e762a22db9f532b995b908a12c1bcbce911c528514b0f7295a1
22
+ image : greenaddress/wallycore@sha256:c6a2a3546b3ebe8db6ab0e78188c92d4cfc1f710c4b3334555dc45dfbf28faaa
23
23
tags :
24
24
- ga
25
25
script :
@@ -29,7 +29,7 @@ linux_py2_debug:
29
29
- DEBUG_WALLY=--enable-debug ./tools/build_js_bindings.sh
30
30
31
31
linux_py3_debug :
32
- image : greenaddress/wallycore@sha256:ab55c35391af5e762a22db9f532b995b908a12c1bcbce911c528514b0f7295a1
32
+ image : greenaddress/wallycore@sha256:c6a2a3546b3ebe8db6ab0e78188c92d4cfc1f710c4b3334555dc45dfbf28faaa
33
33
tags :
34
34
- ga
35
35
script :
@@ -124,7 +124,7 @@ windows10_release:
124
124
- tools\msvc\wheel.bat
125
125
126
126
apidocs :
127
- image : greenaddress/wallycore@sha256:ab55c35391af5e762a22db9f532b995b908a12c1bcbce911c528514b0f7295a1
127
+ image : greenaddress/wallycore@sha256:c6a2a3546b3ebe8db6ab0e78188c92d4cfc1f710c4b3334555dc45dfbf28faaa
128
128
artifacts :
129
129
expire_in : 14 days
130
130
name : wallycore-apidocs
Original file line number Diff line number Diff line change 1
- FROM debian:stretch@sha256:21ac5961a3038a839f6fa92ec4583c90f9eb6ca8f580598cde19d35d0f4d8fa6
1
+ FROM debian:stretch@sha256:72e996751fe42b2a0c1e6355730dc2751ccda50564fec929f76804a6365ef5ef
2
2
COPY stretch_deps.sh /deps.sh
3
3
RUN /deps.sh && rm /deps.sh
4
4
VOLUME /wallycore
5
5
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
Original file line number Diff line number Diff line change 1
1
#! /usr/bin/env bash
2
2
set -e
3
3
4
- export NDK_FILENAME=android-ndk-r19 -linux-x86_64.zip
4
+ export NDK_FILENAME=android-ndk-r19c -linux-x86_64.zip
5
5
6
6
dpkg --add-architecture i386
7
7
Original file line number Diff line number Diff line change @@ -18,17 +18,6 @@ function android_get_cflags() {
18
18
echo $cflags
19
19
}
20
20
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
-
32
21
# Get the configure flags needed to build for Android
33
22
# arch: An architecture from android_get_arch_list()
34
23
# toolsdir: The directory for the NDK toolchain
@@ -70,7 +59,6 @@ function android_build_wally() {
70
59
export CC=$( ls $toolsdir /bin/$clangarchname -linux-android* $api -clang)
71
60
72
61
export CFLAGS=$( android_get_cflags $arch $toolsdir )
73
- export LDFLAGS=$( android_get_ldflags $arch )
74
62
75
63
PATH=" $toolsdir /bin:$PATH " ./configure $( android_get_configure_flags $arch $toolsdir $useropts )
76
64
local num_jobs=4
You can’t perform that action at this time.
0 commit comments