diff options
| author | perpe <msperpe@googlemail.com> | 2013-09-13 12:16:33 +0200 |
|---|---|---|
| committer | perpe <msperpe@googlemail.com> | 2013-09-13 16:20:10 +0200 |
| commit | defeb74de10c317201b88bb17677643634ec4ec8 (patch) | |
| tree | a3e1ff175b851bb333ff98ef1b0240a55848c2d1 /tools | |
| parent | 73fc249a6cf1902d7e4c92fb04de22b898518a71 (diff) | |
droid-x86 corrections
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/android/packaging/Makefile | 1 | ||||
| -rw-r--r-- | tools/android/packaging/xbmc/src/org/xbmc/xbmc/Splash.java | 17 |
2 files changed, 11 insertions, 7 deletions
diff --git a/tools/android/packaging/Makefile b/tools/android/packaging/Makefile index d10be8b883..c58df5e9b1 100644 --- 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 index 7dfcab2bef..d13ee3bc3d 100644 --- 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.ZipEntry; 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 class Splash extends Activity { } 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) { |