From 3d2aa1143ab39524c72267a1f6457b972fa6e7c2 Mon Sep 17 00:00:00 2001 From: Christopher Roy Bratusek Date: Sun, 17 Jan 2021 13:40:37 +0100 Subject: [PATCH] setup_busybox() 64bit arm detection --- CommonInstaller | 2 +- patcher/CommonPatcher | 2 +- systest/SysTest | 2 +- uninstaller/META-INF/com/google/android/update-binary | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/CommonInstaller b/CommonInstaller index 1d7c2121..75b5271d 100644 --- a/CommonInstaller +++ b/CommonInstaller @@ -882,7 +882,7 @@ nanodroid_finalize () { setup_busybox () { case $(uname -m) in - arm* ) local bb_arch=arm ;; + arm* | aarch* ) local bb_arch=arm ;; x86* ) local bb_arch=x86 ;; * ) error "arch \"$(uname -m)\" is not supported" esac diff --git a/patcher/CommonPatcher b/patcher/CommonPatcher index e19184da..4d4b7327 100644 --- a/patcher/CommonPatcher +++ b/patcher/CommonPatcher @@ -333,7 +333,7 @@ detect_odex () { setup_busybox () { case $(uname -m) in - arm* ) local bb_arch=arm ;; + arm* | aarch* ) local bb_arch=arm ;; x86* ) local bb_arch=x86 ;; * ) error "arch \"$(uname -m)\" is not supported" esac diff --git a/systest/SysTest b/systest/SysTest index 73c3c47f..2a807cd8 100644 --- a/systest/SysTest +++ b/systest/SysTest @@ -314,7 +314,7 @@ grep_cmdline() { setup_busybox () { case $(uname -m) in - arm* ) local bb_arch=arm ;; + arm* | aarch* ) local bb_arch=arm ;; x86* ) local bb_arch=x86 ;; * ) error "arch \"$(uname -m)\" is not supported" esac diff --git a/uninstaller/META-INF/com/google/android/update-binary b/uninstaller/META-INF/com/google/android/update-binary index b8d270d2..20c32748 100644 --- a/uninstaller/META-INF/com/google/android/update-binary +++ b/uninstaller/META-INF/com/google/android/update-binary @@ -66,7 +66,7 @@ setup_busybox () { unzip -oq "${ZIP}" busybox.x86 -d "/dev/tmp" case $(uname -m) in - arm* ) local bb_arch=arm ;; + arm* | aarch* ) local bb_arch=arm ;; x86* ) local bb_arch=x86 ;; * ) error "arch \"$(uname -m)\" is not supported" esac