From 7717f0a6b0c4e4c72f38c90272062a6912a0d7c5 Mon Sep 17 00:00:00 2001
From: topjohnwu <topjohnwu@gmail.com>
Date: Thu, 13 May 2021 04:45:13 -0700
Subject: [PATCH] Support Android S AVD

---
 app/src/main/java/com/topjohnwu/magisk/core/Info.kt | 4 +++-
 scripts/emulator.sh                                 | 2 +-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/app/src/main/java/com/topjohnwu/magisk/core/Info.kt b/app/src/main/java/com/topjohnwu/magisk/core/Info.kt
index 37e4ccca1..cb2b89e41 100644
--- a/app/src/main/java/com/topjohnwu/magisk/core/Info.kt
+++ b/app/src/main/java/com/topjohnwu/magisk/core/Info.kt
@@ -35,7 +35,9 @@ object Info {
     @JvmField var ramdisk = false
     @JvmField var hasGMS = true
     @JvmField val isPixel = Build.BRAND == "google"
-    @JvmField val isEmulator = getProperty("ro.kernel.qemu", "0") == "1"
+    @JvmField val isEmulator =
+        getProperty("ro.kernel.qemu", "0") == "1" ||
+        getProperty("ro.boot.qemu", "0") == "1"
     var crypto = ""
     var noDataExec = false
 
diff --git a/scripts/emulator.sh b/scripts/emulator.sh
index d46311547..dabb97090 100755
--- a/scripts/emulator.sh
+++ b/scripts/emulator.sh
@@ -29,7 +29,7 @@ mount_sbin() {
 if [ ! -f /system/build.prop ]; then
   # Running on PC
   cd "$(dirname "$0")/.."
-  adb push native/out/x86/busybox native/out/x86/magiskinit \
+  adb push native/out/x86_64/busybox native/out/x86_64/magiskinit \
   native/out/x86_64/magisk scripts/emulator.sh /data/local/tmp
   adb shell sh /data/local/tmp/emulator.sh
   exit 0