diff --git a/shell/android-studio/flycast/build.gradle b/shell/android-studio/flycast/build.gradle
index 83a57ec40..91f9d85e1 100644
--- a/shell/android-studio/flycast/build.gradle
+++ b/shell/android-studio/flycast/build.gradle
@@ -63,8 +63,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:28.0.0'
-    implementation 'com.android.support:support-v4:28.0.0'
+    implementation 'androidx.appcompat:appcompat:1.3.0'
     implementation 'com.google.oboe:oboe:1.6.0'
     implementation 'org.apache.commons:commons-lang3:3.12.0'
     implementation fileTree(dir: 'libs', include: ['*.aar', '*.jar'], exclude: [])
diff --git a/shell/android-studio/flycast/src/main/AndroidManifest.xml b/shell/android-studio/flycast/src/main/AndroidManifest.xml
index b4488550f..d47a489bb 100644
--- a/shell/android-studio/flycast/src/main/AndroidManifest.xml
+++ b/shell/android-studio/flycast/src/main/AndroidManifest.xml
@@ -159,7 +159,7 @@
 			</intent-filter>
         </activity-alias>
         <provider
-            android:name="android.support.v4.content.FileProvider"
+            android:name="androidx.core.content.FileProvider"
             android:authorities="${applicationId}.provider"
             android:exported="false"
             android:grantUriPermissions="true">
diff --git a/shell/android-studio/flycast/src/main/java/com/reicast/emulator/BaseGLActivity.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/BaseGLActivity.java
index 4b9151dc3..1294a9688 100644
--- a/shell/android-studio/flycast/src/main/java/com/reicast/emulator/BaseGLActivity.java
+++ b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/BaseGLActivity.java
@@ -13,18 +13,18 @@ import android.os.Bundle;
 import android.os.Environment;
 import android.os.Handler;
 import android.preference.PreferenceManager;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v4.app.ActivityCompat;
 import android.util.Log;
 import android.view.InputDevice;
 import android.view.KeyEvent;
 import android.view.MotionEvent;
-import android.view.View;
 import android.view.ViewConfiguration;
 import android.view.Window;
 import android.view.WindowManager;
 
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.core.app.ActivityCompat;
+
 import com.reicast.emulator.config.Config;
 import com.reicast.emulator.debug.GenerateLogs;
 import com.reicast.emulator.emu.AudioBackend;
diff --git a/shell/android-studio/flycast/src/main/java/com/reicast/emulator/Emulator.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/Emulator.java
index 54961da0f..9aa53d8d4 100644
--- a/shell/android-studio/flycast/src/main/java/com/reicast/emulator/Emulator.java
+++ b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/Emulator.java
@@ -4,9 +4,10 @@ import android.app.Application;
 import android.content.Context;
 import android.content.SharedPreferences;
 import android.preference.PreferenceManager;
-import android.support.v7.app.AppCompatDelegate;
 import android.util.Log;
 
+import androidx.appcompat.app.AppCompatDelegate;
+
 import com.reicast.emulator.config.Config;
 import com.reicast.emulator.emu.JNIdc;
 
diff --git a/shell/android-studio/flycast/src/main/java/com/reicast/emulator/FileBrowser.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/FileBrowser.java
index b32e103d6..9885256e0 100644
--- a/shell/android-studio/flycast/src/main/java/com/reicast/emulator/FileBrowser.java
+++ b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/FileBrowser.java
@@ -6,7 +6,7 @@ import java.io.InputStream;
 import java.util.HashSet;
 
 public class FileBrowser {
-	android.support.v4.content.FileProvider provider;	// To avoid ClassNotFoundException at runtime
+	androidx.core.content.FileProvider provider;	// To avoid ClassNotFoundException at runtime
 
 	public static HashSet<String> getExternalMounts() {
 		final HashSet<String> out = new HashSet<>();
diff --git a/shell/android-studio/flycast/src/main/java/com/reicast/emulator/NativeGLActivity.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/NativeGLActivity.java
index ab1efebc4..a906ec042 100644
--- a/shell/android-studio/flycast/src/main/java/com/reicast/emulator/NativeGLActivity.java
+++ b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/NativeGLActivity.java
@@ -1,11 +1,12 @@
 package com.reicast.emulator;
 
 import android.os.Bundle;
-import android.support.annotation.Nullable;
 import android.view.ViewGroup;
 import android.view.Window;
 import android.widget.RelativeLayout;
 
+import androidx.annotation.Nullable;
+
 import com.reicast.emulator.emu.JNIdc;
 import com.reicast.emulator.emu.NativeGLView;
 import com.reicast.emulator.periph.VJoy;
diff --git a/shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/NativeGLView.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/NativeGLView.java
index dabcf05aa..ca90ee309 100644
--- a/shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/NativeGLView.java
+++ b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/NativeGLView.java
@@ -15,8 +15,6 @@ import android.view.View;
 import android.view.WindowInsets;
 
 import com.reicast.emulator.Emulator;
-import com.reicast.emulator.NativeGLActivity;
-import com.reicast.emulator.config.Config;
 
 public class NativeGLView extends SurfaceView implements SurfaceHolder.Callback {
     private boolean surfaceReady = false;
diff --git a/shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/VirtualJoystickDelegate.java b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/VirtualJoystickDelegate.java
index 984f490d2..687fbd076 100644
--- a/shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/VirtualJoystickDelegate.java
+++ b/shell/android-studio/flycast/src/main/java/com/reicast/emulator/emu/VirtualJoystickDelegate.java
@@ -10,7 +10,6 @@ import android.view.ScaleGestureDetector;
 import android.view.View;
 
 import com.reicast.emulator.Emulator;
-import com.reicast.emulator.R;
 import com.reicast.emulator.periph.InputDeviceManager;
 import com.reicast.emulator.periph.VJoy;
 
diff --git a/shell/android-studio/gradle.properties b/shell/android-studio/gradle.properties
index 8be0b88c8..c09e1e3b0 100644
--- a/shell/android-studio/gradle.properties
+++ b/shell/android-studio/gradle.properties
@@ -11,3 +11,7 @@ org.gradle.jvmargs=-Xmx2048m -Dfile.encoding=UTF-8
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
+# AndroidX package structure to make it clearer which packages are bundled with the
+# Android operating system, and which are packaged with your app"s APK
+# https://developer.android.com/topic/libraries/support-library/androidx-rn
+android.useAndroidX=true