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/PackageInfoTest.cpp
+++ b/platforms/android/service/engine/jni/Tests/PackageInfoTest.cpp
@@ -52,6 +52,13 @@ TEST(PackageInfo, FullNameArmv7VFPv3Neon)
 #endif
 }

+TEST(PackageInfo, FullNameAarch64)
+{
+    PackageInfo info(2041000, PLATFORM_UNKNOWN, ARCH_AARCH64);
+    string name = info.GetFullName();
+    EXPECT_STREQ("org.opencv.lib_v24_aarch64", name.c_str());
+}
+
 TEST(PackageInfo, FullNameArmv5)
 {
    PackageInfo info(2030000, PLATFORM_UNKNOWN, ARCH_ARMv5);