diff options
| author | fanquake <fanquake@gmail.com> | 2023-10-12 09:11:34 +0200 |
|---|---|---|
| committer | fanquake <fanquake@gmail.com> | 2023-10-12 09:11:49 +0200 |
| commit | ccf7895e179f6b35ad09788b57563057703ccb53 (patch) | |
| tree | 816cfc1b20a08431aacb7875421a0c2749c5abc2 /ci | |
| parent | e3eb3aae30269b0c9478afe946e7a0871cab5b69 (diff) | |
| parent | 78d3062b68988f5094c61a845be756788933c752 (diff) | |
Merge bitcoin/bitcoin#28633: ci: Install Qt's default Android API platform
78d3062b68988f5094c61a845be756788933c752 ci: Install Android API 31 platform as Qt expects (Hennadii Stepanov)
Pull request description:
When building the `qt` package, it expects that the default (in Qt's view) Android API platform is installed.
During the recent Qt version [update](https://github.com/bitcoin/bitcoin/pull/28561), it has been changed:
```diff
--- a/mkspecs/features/android/sdk.prf
+++ b/mkspecs/features/android/sdk.prf
@@ -1,6 +1,6 @@
API_VERSION_TO_USE = $$(ANDROID_API_VERSION)
isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = $$API_VERSION
-isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-28
+isEmpty(API_VERSION_TO_USE): API_VERSION_TO_USE = android-31
ANDROID_JAR_FILE = $$ANDROID_SDK_ROOT/platforms/$$API_VERSION_TO_USE/android.jar
!exists($$ANDROID_JAR_FILE) {
```
This PR fixes the CI for the Android task and addresses https://github.com/bitcoin/bitcoin/pull/28561#issuecomment-1749180177.
Qt [docs](https://doc.qt.io/qt-5/android.html) still claim that Android API Level 21 and up are supported, however, I did not test every possible configuration.
NOTE: https://github.com/bitcoin/bitcoin/pull/28611 is still valid.
ACKs for top commit:
maflcko:
lgtm ACK 78d3062b68988f5094c61a845be756788933c752
jarolrod:
tACK 78d3062b68988f5094c61a845be756788933c752
Tree-SHA512: 781fba6d80aae7e6500854de14af0d30169c258e395b9e482a5430a7b4a2211a6181f8c9ee58543c896b431abf09e3e7c5573b9672ed128658f11f98a2006e7e
Diffstat (limited to 'ci')
| -rwxr-xr-x | ci/test/01_base_install.sh | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/ci/test/01_base_install.sh b/ci/test/01_base_install.sh index 596cf510bf..68b701f3ca 100755 --- a/ci/test/01_base_install.sh +++ b/ci/test/01_base_install.sh @@ -99,7 +99,7 @@ if [ -n "$ANDROID_HOME" ] && [ ! -d "$ANDROID_HOME" ]; then fi mkdir -p "$ANDROID_HOME" unzip -o "$ANDROID_TOOLS_PATH" -d "$ANDROID_HOME" - yes | "${ANDROID_HOME}"/cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_HOME}" --install "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" "platform-tools" "platforms;android-${ANDROID_API_LEVEL}" "ndk;${ANDROID_NDK_VERSION}" + yes | "${ANDROID_HOME}"/cmdline-tools/bin/sdkmanager --sdk_root="${ANDROID_HOME}" --install "build-tools;${ANDROID_BUILD_TOOLS_VERSION}" "platform-tools" "platforms;android-31" "platforms;android-${ANDROID_API_LEVEL}" "ndk;${ANDROID_NDK_VERSION}" fi git config --global ${CFG_DONE} "true" |