Build fix for case without TegraDetector.

10 years ago · 3649a1a179
parent 352485fc54
commit 3649a1a179
2 changed files with 4 additions and 0 deletions
--- 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)
 {
--- 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)
 {