From 3649a1a1790f45e263bdd06c1b574ce240cd7946 Mon Sep 17 00:00:00 2001 From: Alexander Smorkalov Date: Fri, 20 Feb 2015 13:29:58 +0300 Subject: [PATCH] Build fix for case without TegraDetector. --- .../android/service/engine/jni/Tests/HardwareDetectionTest.cpp | 2 ++ .../android/service/engine/jni/Tests/PackageManagmentTest.cpp | 2 ++ 2 files changed, 4 insertions(+) diff --git a/platforms/android/service/engine/jni/Tests/HardwareDetectionTest.cpp b/platforms/android/service/engine/jni/Tests/HardwareDetectionTest.cpp index 421975152..fd276e9f9 100644 --- a/platforms/android/service/engine/jni/Tests/HardwareDetectionTest.cpp +++ b/platforms/android/service/engine/jni/Tests/HardwareDetectionTest.cpp @@ -153,10 +153,12 @@ TEST(CpuID, CheckAarch64) EXPECT_TRUE(cpu_id & ARCH_AARCH64); } #else +# if defined(__arm__) && defined(USE_TEGRA_HW_DETECTOR) TEST(TegraDetector, Detect) { EXPECT_TRUE(DetectTegra() != 0); } +# endif TEST(CpuID, CheckArmV7) { diff --git a/platforms/android/service/engine/jni/Tests/PackageManagmentTest.cpp b/platforms/android/service/engine/jni/Tests/PackageManagmentTest.cpp index d959ab5d1..33af96156 100644 --- a/platforms/android/service/engine/jni/Tests/PackageManagmentTest.cpp +++ b/platforms/android/service/engine/jni/Tests/PackageManagmentTest.cpp @@ -54,6 +54,7 @@ TEST(PackageManager, GetPackagePathForArmv7) EXPECT_STREQ("/data/data/org.opencv.lib_v23_armv7a/lib", path.c_str()); } +#ifdef __SUPPORT_AARCH64 TEST(PackageManager, GetPackagePathForAarch64) { PackageManagerStub pm; @@ -61,6 +62,7 @@ TEST(PackageManager, GetPackagePathForAarch64) string path = pm.GetPackagePathByVersion(2041100, PLATFORM_UNKNOWN, ARCH_AARCH64); EXPECT_STREQ("/data/data/org.opencv.lib_v24_aarch64/lib", path.c_str()); } +#endif TEST(PackageManager, GetPackagePathForArmv7Neon) {