Skip to content

Commit fcba5b2

Browse files
ARM support: use new arm64 lib if 64-bit ARM is detected.
1 parent f85d3e8 commit fcba5b2

File tree

1 file changed

+2
-5
lines changed

1 file changed

+2
-5
lines changed

objectbox-java/src/main/java/io/objectbox/internal/NativeLibraryLoader.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -130,11 +130,8 @@ private static String getCpuArch() {
130130
} else if (osArch.equalsIgnoreCase("x86")) {
131131
cpuArch = "x86";
132132
} else if ("aarch64".equals(osArch) || osArch.startsWith("armv8") || osArch.startsWith("arm64")) {
133-
// 64-bit ARM version of ObjectBox not built, yet. Fall back to 32-bit armv7 version and warn.
134-
//cpuArch = "arm64";
135-
cpuArch = "armv7";
136-
System.err.printf("[ObjectBox] 64-bit ARM os.arch %s currently not supported, will use %s%n",
137-
osArch, cpuArch);
133+
// 64-bit ARM
134+
cpuArch = "arm64";
138135
} else if (osArch.startsWith("arm")) {
139136
// 32-bit ARM
140137
if (osArch.startsWith("armv7") || osArch.startsWith("armeabi-v7")) {

0 commit comments

Comments
 (0)