add android platform

aicodex · Aug 11, 2017 · 1872587 · 1872587
1 parent dda59b9
commit 1872587
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/main/java/org/jocl/LibUtils.java b/src/main/java/org/jocl/LibUtils.java
@@ -84,7 +84,7 @@ enum OSType
      */
     enum ArchType
     {
-        PPC, PPC_64, SPARC, X86, X86_64, ARM, ARM64, MIPS, MIPS64, RISC, UNKNOWN
+        PPC, PPC_64, SPARC, X86, X86_64, ARM, ARMV7, ARM64, MIPS, MIPS64, RISC, UNKNOWN
     }
 
     /**
@@ -591,14 +591,18 @@ private static ArchType calculateArch()
         {
             return ArchType.X86_64;
         }
-        if (osArch.startsWith("arm64"))
+        if (osArch.startsWith("arm64") || osArch.startsWith("aarch64"))
         {
             return ArchType.ARM64;
         }
-        if (osArch.startsWith("arm"))
+        if (osArch.startsWith("armv5tel"))
         {
             return ArchType.ARM;
         }
+        if (osArch.startsWith("armv7hl"))
+        {
+            return ArchType.ARMV7;
+        }
         if ("ppc".equals(osArch) || "powerpc".equals(osArch))
         {
             return ArchType.PPC;