diff options
| author | Raphael Cotty <raphael.cotty@gmail.com> | 2022-01-30 23:22:16 +0100 |
|---|---|---|
| committer | Raphaël Cotty <raphael.cotty@gmail.com> | 2022-02-06 13:37:15 +0000 |
| commit | 916ff690b3acaf89a499628b8489f2f2d5649bde (patch) | |
| tree | ff5d00e7536a12f2ac80e85e804f4f5fe24fab87 /docker | |
| parent | e0502b32c49d877a790b6f36ddc3f63e5d2f1bc2 (diff) | |
| download | qbs-916ff690b3acaf89a499628b8489f2f2d5649bde.tar.gz | |
Add Qt 6.3 Android image and update ANDROID_PLATFORM
Add docker image focal-android-630 and corresponding github action.
Update ANDROID_PLATFORM to "android-30" because Qt AndroidManifest
uses property allowNativeHeapPointerTagging (QTBUG-97009) since
6.2.1 which was added in API30.
Also update android test because bug QTBUG-97834 was solved in Qt 6.3.
Change-Id: Id45701433a779d2c6cb8dfdbfb0676e2daad6f88
Reviewed-by: Ivan Komissarov <ABBAPOH@gmail.com>
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/focal/test-android.Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/focal/test-android.Dockerfile b/docker/focal/test-android.Dockerfile index 4f48dcf3f..31f4eb773 100644 --- a/docker/focal/test-android.Dockerfile +++ b/docker/focal/test-android.Dockerfile @@ -69,7 +69,7 @@ RUN curl -s https://dl.google.com/android/repository/commandlinetools-linux-${CO rm -v ${ANDROID_HOME}/commandlinetools.zip # Accept SDK license -ARG ANDROID_PLATFORM="android-29" +ARG ANDROID_PLATFORM="android-30" ARG BUILD_TOOLS="29.0.2" RUN yes | sdkmanager "--sdk_root=${ANDROID_HOME}" --verbose --licenses && \ sdkmanager "--sdk_root=${ANDROID_HOME}" --update && \ |