Skip to content

Commit 11ed0bd

Browse files
authored
Merge pull request #1365 from Fry-kun/arm64
Add configs for arm64 binary builds.
2 parents 7a0b8cf + d88b2fb commit 11ed0bd

File tree

3 files changed

+19
-1
lines changed

3 files changed

+19
-1
lines changed

app/src/main/java/dev/ukanth/ufirewall/Api.java

+11
Original file line numberDiff line numberDiff line change
@@ -1859,6 +1859,15 @@ private static boolean installBinariesMips() {
18591859
return true;
18601860
}
18611861

1862+
private static boolean installBinariesArm64() {
1863+
if (!installBinary(ctx, R.raw.busybox_arm64, "busybox")) return false;
1864+
if (!installBinary(ctx, R.raw.iptables_arm64, "iptables")) return false;
1865+
if (!installBinary(ctx, R.raw.ip6tables_arm64, "ip6tables")) return false;
1866+
if (!installBinary(ctx, R.raw.nflog_arm64, "nflog")) return false;
1867+
//if (!installBinary(ctx, R.raw.run_pie_arm64, "run_pie")) return false;
1868+
return true;
1869+
}
1870+
18621871
private static boolean installBinariesArm() {
18631872
if (!installBinary(ctx, R.raw.busybox_arm, "busybox")) return false;
18641873
if (!installBinary(ctx, R.raw.iptables_arm, "iptables")) return false;
@@ -1873,6 +1882,8 @@ private static boolean installBinariesForAbi(String abi) {
18731882
return installBinariesX86();
18741883
} else if (abi.startsWith("mips")) {
18751884
return installBinariesMips();
1885+
} else if (abi.startsWith("arm64")) {
1886+
return installBinariesArm64();
18761887
} else {
18771888
return installBinariesArm();
18781889
}

external/.gitignore

+1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
aarch64-linux-android/
12
arm-linux-androideabi/
23
i686-linux-android/
34
mipsel-linux-android/

external/Makefile

+7-1
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,19 @@ ARCH := arm
77
GCCVER := 4.9
88

99
# You should be able to just 'make ARCH=x86' and it should DTRT.
10-
ARCH_LIST := arm x86 mips
10+
ARCH_LIST := arm arm64 x86 mips
1111
APIVER := 21
1212
ifeq ($(ARCH),arm)
1313
TRIPLET := arm-linux-androideabi
1414
TOOLCHAIN := $(TRIPLET)-$(GCCVER)
1515
NDK_ABINAME := armeabi
1616
endif
17+
ifeq ($(ARCH),arm64)
18+
TRIPLET := aarch64-linux-android
19+
TOOLCHAIN := $(TRIPLET)-$(GCCVER)
20+
APIVER := 21
21+
NDK_ABINAME := arm64-v8a
22+
endif
1723
ifeq ($(ARCH),x86)
1824
TRIPLET := i686-linux-android
1925
TOOLCHAIN := x86-$(GCCVER)

0 commit comments

Comments
 (0)