Android 5 support and aarch64-related fixes for Android Manager.

2015-02-17 16:54:05 +03:00
parent 6a3a6416d7
commit 352485fc54
13 changed files with 62 additions and 23 deletions
--- a/platforms/android/service/engine/jni/Tests/HardwareDetectionTest.cpp
+++ b/platforms/android/service/engine/jni/Tests/HardwareDetectionTest.cpp
@@ -146,6 +146,12 @@ TEST(CpuID, CheckMips)
    EXPECT_TRUE(cpu_id & ARCH_MIPS);
 }
 #endif
+#elif defined(__aarch64__)
+TEST(CpuID, CheckAarch64)
+{
+    int cpu_id = GetCpuID();
+    EXPECT_TRUE(cpu_id & ARCH_AARCH64);
+}
 #else
 TEST(TegraDetector, Detect)
 {