generic-library/opencv
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Build fix for case without TegraDetector.

Browse Source
This commit is contained in:
Alexander Smorkalov
2015-02-20 13:29:58 +03:00
parent 352485fc54
commit 3649a1a179
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platforms/android/service/engine/jni/Tests/HardwareDetectionTest.cpp
View File

@@ -153,10 +153,12 @@ TEST(CpuID, CheckAarch64)
EXPECT_TRUE(cpu_id & ARCH_AARCH64); EXPECT_TRUE(cpu_id & ARCH_AARCH64);
} }
#else #else
# if defined(__arm__) && defined(USE_TEGRA_HW_DETECTOR)
TEST(TegraDetector, Detect) TEST(TegraDetector, Detect)
{ {
EXPECT_TRUE(DetectTegra() != 0); EXPECT_TRUE(DetectTegra() != 0);
} }
# endif
TEST(CpuID, CheckArmV7) TEST(CpuID, CheckArmV7)
{ {

2
platforms/android/service/engine/jni/Tests/PackageManagmentTest.cpp
View File

@@ -54,6 +54,7 @@ TEST(PackageManager, GetPackagePathForArmv7)
EXPECT_STREQ("/data/data/org.opencv.lib_v23_armv7a/lib", path.c_str()); EXPECT_STREQ("/data/data/org.opencv.lib_v23_armv7a/lib", path.c_str());
} }
#ifdef __SUPPORT_AARCH64
TEST(PackageManager, GetPackagePathForAarch64) TEST(PackageManager, GetPackagePathForAarch64)
{ {
PackageManagerStub pm; PackageManagerStub pm;
@@ -61,6 +62,7 @@ TEST(PackageManager, GetPackagePathForAarch64)
string path = pm.GetPackagePathByVersion(2041100, PLATFORM_UNKNOWN, ARCH_AARCH64); string path = pm.GetPackagePathByVersion(2041100, PLATFORM_UNKNOWN, ARCH_AARCH64);
EXPECT_STREQ("/data/data/org.opencv.lib_v24_aarch64/lib", path.c_str()); EXPECT_STREQ("/data/data/org.opencv.lib_v24_aarch64/lib", path.c_str());
} }
#endif
TEST(PackageManager, GetPackagePathForArmv7Neon) TEST(PackageManager, GetPackagePathForArmv7Neon)
{ {