Build fixes. Build scrips reorganized.

2013-05-22 18:09:24 +04:00
parent 20fef00a77
commit f85cf5bdd9
31 changed files with 1687 additions and 301 deletions
--- a/platforms/android/service/engine/CMakeLists.txt
+++ b/platforms/android/service/engine/CMakeLists.txt
@@ -72,4 +72,3 @@ file(GLOB engine_test_files "jni/Tests/*.cpp")

 add_executable(opencv_test_engine ${engine_test_files} jni/Tests/gtest/gtest-all.cpp)
 target_link_libraries(opencv_test_engine z binder log utils android_runtime ${engine} ${engine}_jni)
-
--- a/platforms/android/service/engine/jni/Tests/PackageInfoTest.cpp
+++ b/platforms/android/service/engine/jni/Tests/PackageInfoTest.cpp
@@ -222,4 +222,3 @@ TEST(PackageInfo, Comparator3)
    EXPECT_EQ(info1, info2);
 }
 #endif
-
--- a/platforms/android/service/engine/jni/Tests/PackageManagmentTest.cpp
+++ b/platforms/android/service/engine/jni/Tests/PackageManagmentTest.cpp
@@ -137,5 +137,3 @@ TEST(PackageManager, GetPackagePathForMips)
 //     string path = pm.GetPackagePathByVersion("240", PLATFORM_TEGRA2, 0);
 //     EXPECT_STREQ("/data/data/org.opencv.lib_v24_tegra2/lib", path.c_str());
 // }
-
-