Skip to content

Commit ed40f37

Browse files
committed
Merge bitcoin/bitcoin#22076: build: Fix make apk if ccache enabled, and enable it on CI
15fb575 ci: Enable ccache for "ARM64 Android APK" job (Hennadii Stepanov) 7a777ec build: Fix `make apk` if ccache enabled (Hennadii Stepanov) Pull request description: On master (456c8d6) `make apk` is broken for Android targets if the build system was configured with `--enable-ccache` explicitly or by default. This PR fixes this bug, and enables `ccache` for "ARM64 Android APK" Cirrus CI job. ACKs for top commit: fanquake: ACK 15fb575 Tree-SHA512: e3c94dccc9f07a712e0e01983462ee607122623b213173c74d17e91024243239de212a35e5db94036bfd0a347e727b133865c26c67d6bd279604416ea971ab94
2 parents ddc9029 + 15fb575 commit ed40f37

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

ci/test/00_setup_env_android.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,4 +22,4 @@ export ANDROID_HOME="${DEPENDS_DIR}/SDKs/android"
2222
export ANDROID_NDK_HOME="${ANDROID_HOME}/ndk/${ANDROID_NDK_VERSION}"
2323
export DEP_OPTS="ANDROID_SDK=${ANDROID_HOME} ANDROID_NDK=${ANDROID_NDK_HOME} ANDROID_API_LEVEL=${ANDROID_API_LEVEL} ANDROID_TOOLCHAIN_BIN=${ANDROID_NDK_HOME}/toolchains/llvm/prebuilt/linux-x86_64/bin/"
2424

25-
export BITCOIN_CONFIG="--disable-ccache --disable-tests --enable-gui-tests --disable-bench --disable-fuzz-binary --without-utils --without-libs --without-daemon"
25+
export BITCOIN_CONFIG="--disable-tests --enable-gui-tests --disable-bench --disable-fuzz-binary --without-utils --without-libs --without-daemon"

src/Makefile.qt.include

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -391,7 +391,7 @@ QT_BASE_TLD = $(shell tar tf $(QT_BASE_PATH) --exclude='*/*')
391391

392392
bitcoin_qt_apk: FORCE
393393
mkdir -p $(APK_LIB_DIR)
394-
cp $(dir $(CC))../sysroot/usr/lib/$(host_alias)/libc++_shared.so $(APK_LIB_DIR)
394+
cp $(dir $(lastword $(CC)))../sysroot/usr/lib/$(host_alias)/libc++_shared.so $(APK_LIB_DIR)
395395
tar xf $(QT_BASE_PATH) -C qt/android/src/ $(QT_BASE_TLD)src/android/jar/src --strip-components=5
396396
tar xf $(QT_BASE_PATH) -C qt/android/src/ $(QT_BASE_TLD)src/android/java/src --strip-components=5
397397
tar xf $(QT_BASE_PATH) -C qt/android/res/ $(QT_BASE_TLD)src/android/java/res --strip-components=5

0 commit comments

Comments
 (0)