diff options
| author | Chris "Koying" Browet <cbro@semperpax.com> | 2014-11-20 20:17:58 +0100 |
|---|---|---|
| committer | Chris "Koying" Browet <cbro@semperpax.com> | 2014-11-25 13:45:02 +0100 |
| commit | c98be5e323c597a85a4aca2c5d49f82ec88c2109 (patch) | |
| tree | 620030e6e7fcf4d53b188a179af2d368cdc73a32 | |
| parent | ad7207a9fcf9cc744ca88a03953843f8c7f19b04 (diff) | |
FIX: [droid] aarch64 is always neon-enabled
| -rw-r--r-- | tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java.in | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java.in b/tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java.in index b5f46fcdda..d3a3efb8ef 100644 --- a/tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java.in +++ b/tools/android/packaging/xbmc/src/org/xbmc/kodi/Splash.java.in @@ -502,8 +502,7 @@ public class Splash extends Activity { } private boolean CheckCpuFeature(String feat) { - final Pattern FeaturePattern = Pattern.compile(":.*?\\s" + feat - + "(?:\\s|$)"); + final Pattern FeaturePattern = Pattern.compile("(?i):.*?\\s" + feat + "(?:\\s|$)"); Matcher m = FeaturePattern.matcher(mCpuinfo); return m.find(); } @@ -612,12 +611,13 @@ public class Splash extends Activity { if (curArch.equalsIgnoreCase("arm")) { // arm arch: check if the cpu supports neon boolean ret = ParseCpuFeature(); + //Log.d(TAG, "/proc/cpuinfo = " + mCpuinfo); if (!ret) { mErrorMsg = "Error! Cannot parse CPU features."; Log.e(TAG, mErrorMsg); mState = InError; } else { - ret = CheckCpuFeature("neon"); + ret = CheckCpuFeature("neon") || CheckCpuFeature("aarch64"); //aarch64 is always neon if (!ret) { mErrorMsg = "This @APP_NAME@ package is not compatible with your device (NEON).\nPlease check the <a href=\"http://wiki.kodi.tv/index.php?title=XBMC_for_Android_specific_FAQ\">Kodi Android wiki</a> for more information."; Log.e(TAG, mErrorMsg); |