From 1046f50acb8f2d97c5928240bed0993628c8e480 Mon Sep 17 00:00:00 2001
From: Andrey Kamaev <no@email>
Date: Fri, 27 Apr 2012 15:39:46 +0000
Subject: [PATCH] CMake for new Android example

---
 samples/android/CMakeLists.txt                |  2 ++
 .../color-blob-detection/CMakeLists.txt       |  7 +++++++
 .../color-blob-detection/proguard-project.txt | 20 -------------------
 .../color-blob-detection/project.properties   | 15 --------------
 4 files changed, 9 insertions(+), 35 deletions(-)
 create mode 100644 samples/android/color-blob-detection/CMakeLists.txt
 delete mode 100644 samples/android/color-blob-detection/proguard-project.txt
 delete mode 100644 samples/android/color-blob-detection/project.properties

diff --git a/samples/android/CMakeLists.txt b/samples/android/CMakeLists.txt
index 7999c3a9a5..afb0d224a0 100644
--- a/samples/android/CMakeLists.txt
+++ b/samples/android/CMakeLists.txt
@@ -7,6 +7,8 @@ add_custom_target(opencv_android_examples)
 add_subdirectory(15-puzzle)
 add_subdirectory(face-detection)
 add_subdirectory(image-manipulations)
+add_subdirectory(color-blob-detection)
+
 add_subdirectory(tutorial-0-androidcamera)
 add_subdirectory(tutorial-1-addopencv)
 add_subdirectory(tutorial-2-opencvcamera)
diff --git a/samples/android/color-blob-detection/CMakeLists.txt b/samples/android/color-blob-detection/CMakeLists.txt
new file mode 100644
index 0000000000..400db29ceb
--- /dev/null
+++ b/samples/android/color-blob-detection/CMakeLists.txt
@@ -0,0 +1,7 @@
+set(sample example-color-blob-detection)
+
+add_android_project(${sample} "${CMAKE_CURRENT_SOURCE_DIR}" LIBRARY_DEPS ${OpenCV_BINARY_DIR} SDK_TARGET 11 ${ANDROID_SDK_TARGET})
+if(TARGET ${sample})
+  add_dependencies(opencv_android_examples ${sample})
+endif()
+
diff --git a/samples/android/color-blob-detection/proguard-project.txt b/samples/android/color-blob-detection/proguard-project.txt
deleted file mode 100644
index f2fe1559a2..0000000000
--- a/samples/android/color-blob-detection/proguard-project.txt
+++ /dev/null
@@ -1,20 +0,0 @@
-# To enable ProGuard in your project, edit project.properties
-# to define the proguard.config property as described in that file.
-#
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in ${sdk.dir}/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the ProGuard
-# include property in project.properties.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
-
-# Add any project specific keep options here:
-
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
diff --git a/samples/android/color-blob-detection/project.properties b/samples/android/color-blob-detection/project.properties
deleted file mode 100644
index 33a5ee0222..0000000000
--- a/samples/android/color-blob-detection/project.properties
+++ /dev/null
@@ -1,15 +0,0 @@
-# This file is automatically generated by Android Tools.
-# Do not modify this file -- YOUR CHANGES WILL BE ERASED!
-#
-# This file must be checked in Version Control Systems.
-#
-# To customize properties used by the Ant build system edit
-# "ant.properties", and override values to adapt the script to your
-# project structure.
-#
-# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home):
-#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
-
-# Project target.
-target=android-8
-android.library.reference.1=../../../android/build