diff --git a/.travis.yml b/.travis.yml index 9096e1f..b165d1a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,12 +3,12 @@ jdk: openjdk8 dist: xenial install: # Installing Android SDK - - curl https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip --output $HOME/android-sdk.zip + - curl https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip --output $HOME/android-sdk.zip - unzip -qq $HOME/android-sdk.zip -d $HOME/android-sdk - export ANDROID_SDK_HOME=$HOME/android-sdk - export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk/21.3.6528147 # Installing necessary components of Android SDK - - function installAndroidComponent() { yes | ${ANDROID_SDK_HOME}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_HOME} $1 > /dev/null; } + - function installAndroidComponent() { yes | ${ANDROID_SDK_HOME}/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_HOME} $1 > /dev/null; } - installAndroidComponent "ndk;21.3.6528147" - installAndroidComponent "cmake;3.10.2.4988404" # Installing meson, ninja and nasm that are necessary for libdav1d building diff --git a/tools/docker/Dockerfile b/tools/docker/Dockerfile index 6c81406..ec5dc40 100644 --- a/tools/docker/Dockerfile +++ b/tools/docker/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:20.04 # Arguments that can be overridden in 'docker build' command: # Versions of Android SDK and NDK. The CMake is installed via NDK. -ARG VERSION_SDK=6609375 +ARG VERSION_SDK=6858069 ARG VERSION_NDK=21.3.6528147 ARG VERSION_CMAKE=3.10.2.4988404 @@ -46,7 +46,7 @@ RUN mkdir -p ${HOME_TWIN}/android-sdk && \ rm ${HOME_TWIN}/android-sdk.zip # Installing components through the Android SDK -RUN installAndroidComponent() { yes | ${ANDROID_SDK_HOME}/tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_HOME} "$1" > /dev/null; } && \ +RUN installAndroidComponent() { yes | ${ANDROID_SDK_HOME}/cmdline-tools/bin/sdkmanager --sdk_root=${ANDROID_SDK_HOME} "$1" > /dev/null; } && \ installAndroidComponent "ndk;${VERSION_NDK}" && \ installAndroidComponent "cmake;${VERSION_CMAKE}"