diff --git a/android-project/.gitignore b/android-project/.gitignore
new file mode 100644
index 000000000..59dc52887
--- /dev/null
+++ b/android-project/.gitignore
@@ -0,0 +1,12 @@
+# Intellij
+.idea/
+
+# Gradle files
+/.gradle/
+build/
+
+# Android
+/app/.cxx/
+
+# Local configuration file (sdk path, etc)
+/local.properties
diff --git a/android-project/app/build.gradle b/android-project/app/build.gradle
index bf3c35d6b..a691cf442 100644
--- a/android-project/app/build.gradle
+++ b/android-project/app/build.gradle
@@ -8,25 +8,18 @@ else {
 }
 
 android {
-    compileSdkVersion 26
+    compileSdkVersion 28
     defaultConfig {
         if (buildAsApplication) {
             applicationId "org.libsdl.app"
         }
-        minSdkVersion 16
-        targetSdkVersion 26
-        versionCode 1
-        versionName "1.0"
+        minSdkVersion 21
+        targetSdkVersion 28
         externalNativeBuild {
-            ndkBuild {
-                arguments "APP_PLATFORM=android-16"
+            cmake {
+                arguments "-DANDROID_APP_PLATFORM=android-21", "-DANDROID_STL=c++_static"
                 abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
             }
-            // cmake {
-            //     arguments "-DANDROID_APP_PLATFORM=android-16", "-DANDROID_STL=c++_static"
-            //     // abiFilters 'armeabi-v7a', 'arm64-v8a', 'x86', 'x86_64'
-            //     abiFilters 'arm64-v8a'
-            // }
         }
     }
     buildTypes {
@@ -40,18 +33,13 @@ android {
             jniLibs.srcDir 'libs'
         }
         externalNativeBuild {
-            ndkBuild {
-                path 'jni/Android.mk'
+            cmake {
+                path '../../CMakeLists.txt'
+                version "3.18.1"
             }
-            // cmake {
-            //     path 'jni/CMakeLists.txt'
-            // }
         }
        
     }
-    lintOptions {
-        abortOnError false
-    }
     
     if (buildAsLibrary) {
         libraryVariants.all { variant ->
diff --git a/android-project/build.gradle b/android-project/build.gradle
index f6f90b25b..cf780a6ad 100644
--- a/android-project/build.gradle
+++ b/android-project/build.gradle
@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.2.0'
+        classpath 'com.android.tools.build:gradle:4.1.3'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
diff --git a/android-project/gradle/wrapper/gradle-wrapper.properties b/android-project/gradle/wrapper/gradle-wrapper.properties
index f9b3be2f9..825a67a44 100644
--- a/android-project/gradle/wrapper/gradle-wrapper.properties
+++ b/android-project/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Mon Oct 23 13:51:26 PDT 2017
+#Mon Jun 07 15:45:49 CEST 2021
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.2-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip