From 57fb5f0981119cf96cc14e23190e976de6f1c91e Mon Sep 17 00:00:00 2001
From: Andrey Kamaev <no@email>
Date: Thu, 28 Jun 2012 19:32:32 +0000
Subject: [PATCH] Merged Android build fix

---
 modules/java/android_test/CMakeLists.txt | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/modules/java/android_test/CMakeLists.txt b/modules/java/android_test/CMakeLists.txt
index 1ac8719..fcbb3b3 100644
--- a/modules/java/android_test/CMakeLists.txt
+++ b/modules/java/android_test/CMakeLists.txt
@@ -47,8 +47,9 @@ add_custom_command(
     COMMAND ${CMAKE_COMMAND} -E touch "${opencv_test_java_bin_dir}/bin/OpenCVTest-debug.apk" # needed because ant does not update the timestamp of updated apk
     WORKING_DIRECTORY "${opencv_test_java_bin_dir}"
     MAIN_DEPENDENCY "${opencv_test_java_bin_dir}/${ANDROID_MANIFEST_FILE}"
-    DEPENDS "${OpenCV_BINARY_DIR}/bin/classes.jar" opencv_java
-    DEPENDS ${opencv_test_java_file_deps})
+    DEPENDS "${OpenCV_BINARY_DIR}/bin/.classes.jar.dephelper" opencv_java
+    DEPENDS ${opencv_test_java_file_deps} ${__android_project_chain})
+set(__android_project_chain ${PROJECT_NAME} CACHE INTERNAL "auxiliary variable used for Android progects chaining")
 
 add_custom_target(${PROJECT_NAME} ALL SOURCES "${opencv_test_java_bin_dir}/bin/OpenCVTest-debug.apk" )
 add_dependencies(${PROJECT_NAME} opencv_java)
-- 
2.7.4