From 3fff34e08ae1200b6837b49910810932a6d5d6bb Mon Sep 17 00:00:00 2001
From: Cameron Gutman <aicommander@gmail.com>
Date: Wed, 27 Dec 2017 19:40:49 -0800
Subject: [PATCH] Don't extract native libraries for non-root build

---
 app/src/nonRoot/AndroidManifest.xml | 5 ++++-
 app/src/root/AndroidManifest.xml    | 6 +++++-
 2 files changed, 9 insertions(+), 2 deletions(-)

diff --git a/app/src/nonRoot/AndroidManifest.xml b/app/src/nonRoot/AndroidManifest.xml
index 3fe824bf..7b71a738 100644
--- a/app/src/nonRoot/AndroidManifest.xml
+++ b/app/src/nonRoot/AndroidManifest.xml
@@ -2,5 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Non-root application name -->
-    <application android:label="Moonlight" />
+    <!-- No need to extract libraries for the non-root version -->
+    <application
+        android:label="Moonlight"
+        android:extractNativeLibs="false" />
 </manifest>
diff --git a/app/src/root/AndroidManifest.xml b/app/src/root/AndroidManifest.xml
index 3752ae33..f0cd52e1 100644
--- a/app/src/root/AndroidManifest.xml
+++ b/app/src/root/AndroidManifest.xml
@@ -2,5 +2,9 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <!-- Root application name -->
-    <application android:label="Moonlight (Root)" />
+    <!-- Ensure native libraries are always extracted for root builds,
+         since we must invoke the evdev_reader binary ourselves -->
+    <application
+        android:label="Moonlight (Root)"
+        android:extractNativeLibs="true" />
 </manifest>