-From ae20a3063513f2568abf07b58af72002b24f2f93 Mon Sep 17 00:00:00 2001
+From f3cba47b930764cd69943f76b02c22a20f1e70b8 Mon Sep 17 00:00:00 2001
 From: Michael Vines <mvines@silklabs.com>
 Date: Mon, 7 Mar 2016 08:51:20 -0800
 Subject: [PATCH] Android.mk
 
 ---
- Android.mk                   | 111 +++++++++++++++++++++++++++++++++++++++++++
+ Android.mk                   | 112 +++++++++++++++++++++++++++++++++++++++++++
  apps/traincascade/Android.mk |  19 ++++++++
  opencv.mk                    |  46 ++++++++++++++++++
- 3 files changed, 176 insertions(+)
+ 3 files changed, 177 insertions(+)
  create mode 100644 Android.mk
  create mode 100644 apps/traincascade/Android.mk
  create mode 100644 opencv.mk
 
 diff --git a/Android.mk b/Android.mk
 new file mode 100644
-index 0000000..1c8737e
+index 000000000..574c68ccd
 --- /dev/null
 +++ b/Android.mk
-@@ -0,0 +1,111 @@
+@@ -0,0 +1,114 @@
 +LOCAL_PATH:= $(call my-dir)
 +
 +include $(CLEAR_VARS)

+
diff --git a/opencv.mk b/opencv.mk
new file mode 100644
index 0000000..c5d29f5
--- /dev/null
+++ b/opencv.mk
@@ -0,0 +1,46 @@
+# Include from your Android.mk to link with OpenCV, after defining LOCAL_MODULE
+OPENCV3_CORE_MODULES := \
+  calib3d \

+include $(call all-makefiles-under,$(LOCAL_PATH))
diff --git a/apps/traincascade/Android.mk b/apps/traincascade/Android.mk
new file mode 100644
index 000000000..71fef7c06
--- /dev/null
+++ b/apps/traincascade/Android.mk
@@ -0,0 +1,19 @@
