setup_busybox() 64bit arm detection

3 years ago · 3d2aa1143a
parent a05fdf8e71
commit 3d2aa1143a
4 changed files with 4 additions and 4 deletions
--- a/2
+++ b/2
@ -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
--- 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
--- 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
--- 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