From 6f105ae43bb624654fbe74a976c439f5fb75efd7 Mon Sep 17 00:00:00 2001
From: SomberNight <somber.night@protonmail.com>
Date: Wed, 18 Nov 2020 20:22:13 +0100
Subject: [PATCH] android build: bump targetSdkVersion to 29 (follow-up)

follow-up: 59e9337be07bbc5439a4ceedaddf4d163e9c0fa2

For some reason, without this change, the first build works but subsequent builds fail.
Not sure what the cause is. This is why Travis builds work.
---
 contrib/android/Dockerfile     | 2 +-
 contrib/android/buildozer.spec | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/contrib/android/Dockerfile b/contrib/android/Dockerfile
index c57b85231..304956737 100644
--- a/contrib/android/Dockerfile
+++ b/contrib/android/Dockerfile
@@ -67,7 +67,7 @@ RUN yes | ${ANDROID_SDK_MANAGER} --licenses > /dev/null
 
 # download platforms, API, build tools
 RUN ${ANDROID_SDK_MANAGER} "platforms;android-24" > /dev/null && \
-    ${ANDROID_SDK_MANAGER} "platforms;android-28" > /dev/null && \
+    ${ANDROID_SDK_MANAGER} "platforms;android-29" > /dev/null && \
     ${ANDROID_SDK_MANAGER} "build-tools;${ANDROID_SDK_BUILD_TOOLS_VERSION}" > /dev/null && \
     ${ANDROID_SDK_MANAGER} "extras;android;m2repository" > /dev/null && \
     chmod +x "${ANDROID_SDK_HOME}/tools/bin/avdmanager"
diff --git a/contrib/android/buildozer.spec b/contrib/android/buildozer.spec
index e6bc461d8..582486486 100644
--- a/contrib/android/buildozer.spec
+++ b/contrib/android/buildozer.spec
@@ -70,7 +70,8 @@ fullscreen = False
 # (list) Permissions
 android.permissions = INTERNET, CAMERA, WRITE_EXTERNAL_STORAGE
 
-# (int) Android API to use  (targetSdkVersion)
+# (int) Android API to use  (targetSdkVersion AND compileSdkVersion)
+# note: when changing, Dockerfile also needs to be changed to install corresponding build tools
 android.api = 29
 
 # (int) Minimum API required. You will need to set the android.ndk_api to be as low as this value.