Merge branch 'beta' into code-cleanup

ukanth · Jul 18, 2024 · f2b787b · f2b787b
2 parents 5932feb + 4f5f4e5
commit f2b787b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 1 deletion.
diff --git a/app/build.gradle b/app/build.gradle
@@ -28,6 +28,7 @@ android {
         }
     }
 
+
     lint {
         abortOnError true
         disable 'MissingTranslation'

diff --git a/app/src/main/java/dev/ukanth/ufirewall/Api.java b/app/src/main/java/dev/ukanth/ufirewall/Api.java
@@ -1853,6 +1853,15 @@ private static boolean installBinariesMips() {
         return true;
     }
 
+    private static boolean installBinariesArm64() {
+        if (!installBinary(ctx, R.raw.busybox_arm64, "busybox")) return false;
+        if (!installBinary(ctx, R.raw.iptables_arm64, "iptables")) return false;
+        if (!installBinary(ctx, R.raw.ip6tables_arm64, "ip6tables")) return false;
+        if (!installBinary(ctx, R.raw.nflog_arm64, "nflog")) return false;
+        //if (!installBinary(ctx, R.raw.run_pie_arm64, "run_pie")) return false;
+        return true;
+    }
+
     private static boolean installBinariesArm() {
         if (!installBinary(ctx, R.raw.busybox_arm, "busybox")) return false;
         if (!installBinary(ctx, R.raw.iptables_arm, "iptables")) return false;
@@ -1867,6 +1876,8 @@ private static boolean installBinariesForAbi(String abi) {
             return installBinariesX86();
         } else if (abi.startsWith("mips")) {
             return installBinariesMips();
+        } else if (abi.startsWith("arm64")) {
+            return installBinariesArm64();
         } else {
             return installBinariesArm();
         }

diff --git a/external/.gitignore b/external/.gitignore
@@ -1,3 +1,4 @@
+aarch64-linux-android/
 arm-linux-androideabi/
 i686-linux-android/
 mipsel-linux-android/

diff --git a/external/Makefile b/external/Makefile
@@ -7,13 +7,19 @@ ARCH    := arm
 GCCVER  := 4.9
 
 # You should be able to just 'make ARCH=x86' and it should DTRT.
-ARCH_LIST := arm x86 mips
+ARCH_LIST := arm arm64 x86 mips
 APIVER := 21
 ifeq ($(ARCH),arm)
 TRIPLET := arm-linux-androideabi
 TOOLCHAIN := $(TRIPLET)-$(GCCVER)
 NDK_ABINAME := armeabi
 endif
+ifeq ($(ARCH),arm64)
+TRIPLET := aarch64-linux-android
+TOOLCHAIN := $(TRIPLET)-$(GCCVER)
+APIVER  := 21
+NDK_ABINAME := arm64-v8a
+endif
 ifeq ($(ARCH),x86)
 TRIPLET := i686-linux-android
 TOOLCHAIN := x86-$(GCCVER)
-Original file line number
+Diff line change
@@ Expand Up / @@ -28,6 +28,7 @@ android { @@
             }
         }
         lint {
             abortOnError true
             disable 'MissingTranslation'
@@ Expand Down @@