diff options
| author |  Dirk Hohndel <dirk@hohndel.org> | 2020-11-18 22:01:29 +0000 |
|---|---|---|
| committer | Dirk Hohndel <dirk@hohndel.org> | 2020-11-19 17:18:33 -0800 |
| commit | cb4ccea3c225fa4d294f4861530ff3b67c1d9efd (patch) | |
| tree | 0eeb171fb50df0a442f6c540d841171112c347b8 /scripts/docker/android-build-container/setup-docker.sh | |
| parent | 3071ea06f010664af636fbb26edec53abbbe58de (diff) | |
| download | subsurface-cb4ccea3c225fa4d294f4861530ff3b67c1d9efd.tar.gz | |
build-system: update Android builder docker container
This adjusts the docker setup to create a container with the correct
NDK, SDK, tools, Qt version, etc, and updates the helper scripts that
are needed in order to do that.
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
Diffstat (limited to 'scripts/docker/android-build-container/setup-docker.sh')
| -rw-r--r-- | scripts/docker/android-build-container/setup-docker.sh | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/scripts/docker/android-build-container/setup-docker.sh b/scripts/docker/android-build-container/setup-docker.sh index f9b9b5310..e8437d30e 100644 --- a/scripts/docker/android-build-container/setup-docker.sh +++ b/scripts/docker/android-build-container/setup-docker.sh @@ -2,10 +2,19 @@ # Use this to re-create a docker container for building Android binaries +# Google makes it intentionally very hard to download the command line tools +# the URL is constantly changing and the website requires you to click through +# a license. +# Today this URL works: +if [ ! -f commandlinetools-linux-6858069_latest.zip ] ; then + wget https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip +fi +# if this fails, go to https://developer.android.com/studio#cmdline-tools and click through +# for yourself... + # copy the dependency script into this folder -cp ../../../packaging/android/android-build-wrapper.sh . +cp ../../../packaging/android/android-build-setup.sh . cp ../../../packaging/android/variables.sh . -cp ../../../packaging/android/install-qt.sh . # create the container (this takes a while) sudo docker build -t android-builder --squash . |