droid-x86 corrections

xbmc · Sep 13, 2013 · defeb74 · defeb74
1 parent 73fc249
commit defeb74
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 7 deletions.
diff --git a/tools/android/packaging/Makefile b/tools/android/packaging/Makefile
@@ -24,6 +24,7 @@ ARMOVERRIDES=XBMC_OVERRIDE_HOST=arm-linux-androideabi XBMC_OVERRIDE_TOOLCHAIN=$(
 #arm and x86
 ifeq ($(findstring i686,$(CPU)),i686)
 ARCH=x86
+CPU=x86
 endif
 ifeq ($(findstring arm,$(CPU)),arm)
 ARCH=arm

diff --git a/tools/android/packaging/xbmc/src/org/xbmc/xbmc/Splash.java b/tools/android/packaging/xbmc/src/org/xbmc/xbmc/Splash.java
@@ -14,6 +14,7 @@
 import java.util.zip.ZipFile;
 
 import android.os.AsyncTask;
+import android.os.Build;
 import android.os.Bundle;
 import android.app.Activity;
 import android.app.ActivityManager;
@@ -261,16 +262,18 @@ public void onCreate(Bundle savedInstanceState) {
       }
 
     mState = State.Checking;
-
-    boolean ret = ParseCpuFeature();
+    boolean ret = Build.CPU_ABI.equals("x86");
     if (!ret) {
-      mErrorMsg = "Error! Cannot parse CPU features.";
-      mState = State.InError;
-    } else {
-      ret = CheckCpuFeature("neon");
+      ret = ParseCpuFeature();
       if (!ret) {
-        mErrorMsg = "This XBMC package is not compatible with your device.\nPlease check the <a href=\"http://wiki.xbmc.org/index.php?title=XBMC_for_Android_specific_FAQ\">XBMC Android wiki</a> for more information.";
+        mErrorMsg = "Error! Cannot parse CPU features.";
         mState = State.InError;
+      } else {
+        ret = CheckCpuFeature("neon");
+        if (!ret) {
+          mErrorMsg = "This XBMC package is not compatible with your device.\nPlease check the <a href=\"http://wiki.xbmc.org/index.php?title=XBMC_for_Android_specific_FAQ\">XBMC Android wiki</a> for more information.";
+          mState = State.InError;
+        }
       }
     }
     if (mState != State.InError) {