From 1e82e8e5f0a0059e1c29fc60e496a0df4aad5662 Mon Sep 17 00:00:00 2001
From: utzcoz <utzcoz@outlook.com>
Date: Sat, 28 Oct 2023 18:50:00 +0800
Subject: [PATCH] xrt/android: Move extractNativeLibs to build script for
 openxr_android

It's recommended by Android Studio when upgrading AGP.

Signed-off-by: utzcoz <utzcoz@outlook.com>
---
 src/xrt/targets/openxr_android/build.gradle                 | 3 +++
 src/xrt/targets/openxr_android/src/main/AndroidManifest.xml | 1 -
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/xrt/targets/openxr_android/build.gradle b/src/xrt/targets/openxr_android/build.gradle
index 7809fb98a..6f9da9796 100644
--- a/src/xrt/targets/openxr_android/build.gradle
+++ b/src/xrt/targets/openxr_android/build.gradle
@@ -193,6 +193,9 @@ android {
         resources {
             excludes += ['META-INF/*.kotlin_module']
         }
+        jniLibs {
+            useLegacyPackaging true
+        }
     }
     namespace 'org.freedesktop.monado.openxr_runtime'
     lint {
diff --git a/src/xrt/targets/openxr_android/src/main/AndroidManifest.xml b/src/xrt/targets/openxr_android/src/main/AndroidManifest.xml
index dae28670c..c506eb3ca 100644
--- a/src/xrt/targets/openxr_android/src/main/AndroidManifest.xml
+++ b/src/xrt/targets/openxr_android/src/main/AndroidManifest.xml
@@ -46,7 +46,6 @@
     <application
         android:name="org.freedesktop.monado.openxr_runtime.MonadoOpenXrApplication"
         android:allowBackup="true"
-        android:extractNativeLibs="true"
         android:icon="@drawable/ic_monado_logo"
         android:label="@string/app_name"
         android:supportsRtl="true"