append 64bit OS selections.

kuri65536 · Aug 6, 2015 · 9bb8e72 · 9bb8e72
1 parent a1e8921
commit 9bb8e72
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/...terForAndroid/src/com/googlecode/android_scripting/interpreter/Sl4aHostedInterpreter.java b/...terForAndroid/src/com/googlecode/android_scripting/interpreter/Sl4aHostedInterpreter.java
@@ -57,15 +57,21 @@ public int getScriptsVersion() {
 
     public String getPlatformString() {
         String ret = System.getProperty("os.arch");
-        if (ret.startsWith("arm")) {
+        ret = ret.toLowerCase();
+        if (ret.startsWith("arm") || ret.startsWith("aarch64")) {
             ret = "";
         }
-        else if (ret.startsWith("i686")) {
+        else if (ret.startsWith("i686") ||
+                 ret.startsWith("x86_64") ||
+                 ret.startsWith("amd64")) {
             ret = "_x86";
         }
         else if (ret.startsWith("mips")) {
             ret = "_mips";
         }
+        else {
+            ret = "";
+        }
         return ret;
     }
 

diff --git a/android/PythonCommon/src/com/googlecode/android_scripting/pythoncommon/PythonDescriptor.java b/android/PythonCommon/src/com/googlecode/android_scripting/pythoncommon/PythonDescriptor.java
@@ -84,7 +84,7 @@ public String getName() {
   }
 
   public String getNiceName() {
-    return "Python 2.7.9";
+    return "Python 2.7.10";
   }
 
   public boolean hasInterpreterArchive() {