From 1414663fca75b06c2e268eb7cc93e731170cc911 Mon Sep 17 00:00:00 2001
From: Martin Quinson <martin.quinson@loria.fr>
Date: Mon, 12 Oct 2015 05:50:57 +0200
Subject: [PATCH 1/1] [java] properly port to armv7l, sorry for the noise

---
 src/bindings/java/org/simgrid/NativeLib.java | 1 +
 tools/cmake/Java.cmake                       | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/bindings/java/org/simgrid/NativeLib.java b/src/bindings/java/org/simgrid/NativeLib.java
index cdb7710c5d..6bd5daecaa 100644
--- a/src/bindings/java/org/simgrid/NativeLib.java
+++ b/src/bindings/java/org/simgrid/NativeLib.java
@@ -47,6 +47,7 @@ public final class NativeLib {
 	}
 
 	public static String getPath() {
+		// Inspiration: https://github.com/xerial/snappy-java/blob/develop/src/main/java/org/xerial/snappy/OSInfo.java
 		String prefix = "NATIVE";
 		String os = System.getProperty("os.name");
 		String arch = System.getProperty("os.arch");
diff --git a/tools/cmake/Java.cmake b/tools/cmake/Java.cmake
index d73314c302..f480b95050 100644
--- a/tools/cmake/Java.cmake
+++ b/tools/cmake/Java.cmake
@@ -100,9 +100,6 @@ if(enable_lib_in_jar)
   if(${SG_SYSTEM_NAME} MATCHES "kFreeBSD")
     set(SG_SYSTEM_NAME GNU/kFreeBSD)
   endif()
-  if(${SG_SYSTEM_NAME} MATCHES "armv7l")
-    set(SG_SYSTEM_NAME arm) # Default arm (soft-float ABI)
-  endif()
 
   set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/${CMAKE_SYSTEM_PROCESSOR})
   if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "^i[3-6]86$")
@@ -112,6 +109,9 @@ if(enable_lib_in_jar)
        (${CMAKE_SYSTEM_PROCESSOR} MATCHES "AMD64")     )
     set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/amd64)
   endif()
+  if(${CMAKE_SYSTEM_PROCESSOR} MATCHES "armv7l")
+    set(JAVA_NATIVE_PATH NATIVE/${SG_SYSTEM_NAME}/arm) # Default arm (soft-float ABI)
+  endif()
 
   add_custom_command(
     TARGET simgrid-java_jar POST_BUILD
-- 
2.20.1