diff --git a/.gitlab-ci-files/job-tester.yml b/.gitlab-ci-files/job-tester.yml index 5cde7f8cb..88adbc5b7 100644 --- a/.gitlab-ci-files/job-tester.yml +++ b/.gitlab-ci-files/job-tester.yml @@ -2,7 +2,7 @@ job-android-tester: stage: test tags: [ "docker-test-liblinphone-lenovo-2-sdk " ] - image: gitlab.linphone.org:4567/bc/public/linphone-android/bc-dev-android:20230414_bullseye_jdk_17_cleaned + image: gitlab.linphone.org:4567/bc/public/linphone-android/bc-dev-android:20250901_add_hardware_accel_for_tests #only: # - schedules diff --git a/docker-files/bc-dev-android-33 b/docker-files/bc-dev-android-33 index 6ea291fc4..2fe9feb49 100644 --- a/docker-files/bc-dev-android-33 +++ b/docker-files/bc-dev-android-33 @@ -31,8 +31,8 @@ RUN wget https://dl.google.com/android/repository/commandlinetools-linux-9477386 # Update path to include all Android SDK tools ENV PATH $ANDROID_HOME/cmdline-tools/latest/bin:$ANDROID_HOME/tools:$ANDROID_HOME/tools/bin:$ANDROID_HOME/platform-tools:$PATH -# Get the Android SDK -RUN echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platform-tools" "tools" "platforms;android-33" +# Get the Android SDK, and cmdlinetools + x86_64 hardware accel for tests +RUN echo "y" | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager "platform-tools" "tools" "platforms;android-33" "cmdline-tools;19.0" "system-images;android-33;default;x86_64" # Accept Android SDK licenses RUN yes | $ANDROID_HOME/cmdline-tools/latest/bin/sdkmanager --licenses