Skip to content

Commit c47944f

Browse files
committed
ci: Reuse some configure options in "ARM64 Android APK" task
1 parent 7739438 commit c47944f

File tree

1 file changed

+7
-5
lines changed

1 file changed

+7
-5
lines changed

ci/test/06_script_a.sh

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,18 +6,20 @@
66

77
export LC_ALL=C.UTF-8
88

9+
BITCOIN_CONFIG_ALL="--enable-suppress-external-warnings --disable-dependency-tracking --prefix=$DEPENDS_DIR/$HOST"
10+
if [ -z "$NO_WERROR" ]; then
11+
BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-werror"
12+
fi
13+
914
if [ -n "$ANDROID_TOOLS_URL" ]; then
1015
CI_EXEC make distclean || true
1116
CI_EXEC ./autogen.sh
12-
CI_EXEC ./configure "$BITCOIN_CONFIG" --prefix="${DEPENDS_DIR}/aarch64-linux-android" || ( (CI_EXEC cat config.log) && false)
17+
CI_EXEC ./configure "$BITCOIN_CONFIG_ALL" "$BITCOIN_CONFIG" || ( (CI_EXEC cat config.log) && false)
1318
CI_EXEC "make $MAKEJOBS && cd src/qt && ANDROID_HOME=${ANDROID_HOME} ANDROID_NDK_HOME=${ANDROID_NDK_HOME} make apk"
1419
exit 0
1520
fi
1621

17-
BITCOIN_CONFIG_ALL="--enable-external-signer --enable-suppress-external-warnings --disable-dependency-tracking --prefix=$DEPENDS_DIR/$HOST --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib"
18-
if [ -z "$NO_WERROR" ]; then
19-
BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-werror"
20-
fi
22+
BITCOIN_CONFIG_ALL="${BITCOIN_CONFIG_ALL} --enable-external-signer --bindir=$BASE_OUTDIR/bin --libdir=$BASE_OUTDIR/lib"
2123
CI_EXEC "ccache --zero-stats --max-size=$CCACHE_SIZE"
2224

2325
if [ -n "$CONFIG_SHELL" ]; then

0 commit comments

Comments
 (0)