k
/
ffmpeg-android-maker
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'development' into what-the-codec

Browse Source
media-file
Javernaut 4 years ago
parent 95a9300d7f 0dba4da61b
commit 6393bc6363
2 changed files with 2 additions and 2 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      .travis.yml
  2. 2
      tools/docker/Dockerfile

2
.travis.yml
Unescape View File

@ -3,7 +3,7 @@ jdk: openjdk8
dist: xenial dist: xenial
install: install:
# Installing Android SDK # Installing Android SDK
- curl https://dl.google.com/android/repository/commandlinetools-linux-6514223_latest.zip --output $HOME/android-sdk.zip - curl https://dl.google.com/android/repository/commandlinetools-linux-6609375_latest.zip --output $HOME/android-sdk.zip
- unzip -qq $HOME/android-sdk.zip -d $HOME/android-sdk - unzip -qq $HOME/android-sdk.zip -d $HOME/android-sdk
- export ANDROID_SDK_HOME=$HOME/android-sdk - export ANDROID_SDK_HOME=$HOME/android-sdk
- export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk/21.3.6528147 - export ANDROID_NDK_HOME=$ANDROID_SDK_HOME/ndk/21.3.6528147

2
tools/docker/Dockerfile
Unescape View File

@ -2,7 +2,7 @@ FROM ubuntu:20.04
# Arguments that can be overridden in 'docker build' command: # Arguments that can be overridden in 'docker build' command:
# Versions of Android SDK and NDK. The CMake is installed via NDK. # Versions of Android SDK and NDK. The CMake is installed via NDK.
ARG VERSION_SDK=6514223 ARG VERSION_SDK=6609375
ARG VERSION_NDK=21.3.6528147 ARG VERSION_NDK=21.3.6528147
ARG VERSION_CMAKE=3.10.2.4988404 ARG VERSION_CMAKE=3.10.2.4988404

Write Preview
Loading…
Cancel
Save