From 50df762c4ec8b8aa1ced7b45ae9a82434efc1b33 Mon Sep 17 00:00:00 2001
From: Ethan Rublee <no@email>
Date: Sun, 26 Sep 2010 18:12:42 +0000
Subject: [PATCH] giving the android jni a start up function OnLoad

---
 android/android-jni/jni/Application.mk |  4 +---
 android/android-jni/jni/android-cv.i   |  2 ++
 android/android-jni/jni/image_pool.cpp | 10 ++++++++++
 android/android-jni/jni/image_pool.h   |  2 +-
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/android/android-jni/jni/Application.mk b/android/android-jni/jni/Application.mk
index 37e67d8..5d44df5 100644
--- a/android/android-jni/jni/Application.mk
+++ b/android/android-jni/jni/Application.mk
@@ -1,4 +1,2 @@
-# The ARMv7 is significanly faster due to the use of the hardware FPU
 APP_ABI := armeabi armeabi-v7a
-APP_BUILD_SCRIPT := $(call my-dir)/Android.mk
-APP_PROJECT_PATH := $(PROJECT_PATH)
\ No newline at end of file
+APP_MODULES      := android-opencv
diff --git a/android/android-jni/jni/android-cv.i b/android/android-jni/jni/android-cv.i
index c8f9364..54eba06 100644
--- a/android/android-jni/jni/android-cv.i
+++ b/android/android-jni/jni/android-cv.i
@@ -34,6 +34,7 @@ using namespace cv;
   }
 %}
 
+
 %pragma(java) jniclasscode=%{
   static {
     try {
@@ -48,6 +49,7 @@ using namespace cv;
   }
 %}
 
+
 %include "cv.i"
 
 %include "glcamera.i"
diff --git a/android/android-jni/jni/image_pool.cpp b/android/android-jni/jni/image_pool.cpp
index 863b413..42e76b4 100644
--- a/android/android-jni/jni/image_pool.cpp
+++ b/android/android-jni/jni/image_pool.cpp
@@ -5,6 +5,16 @@
 #include <android/log.h>
 #include <opencv2/imgproc/imgproc.hpp>
 
+#define  LOG_TAG    "libandroid-opencv"
+#define  LOGI(...)  __android_log_print(ANDROID_LOG_INFO,LOG_TAG,__VA_ARGS__)
+#define  LOGE(...)  __android_log_print(ANDROID_LOG_ERROR,LOG_TAG,__VA_ARGS__)
+
+JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved)
+{
+JNIEnv *env;
+LOGI("JNI_OnLoad called for opencv");
+return JNI_VERSION_1_4;
+}
 
 JNIEXPORT void JNICALL Java_com_opencv_jni_opencvJNI_addYUVtoPool(JNIEnv * env,
 		jclass thiz, jlong ppool, jobject _jpool, jbyteArray jbuffer,
diff --git a/android/android-jni/jni/image_pool.h b/android/android-jni/jni/image_pool.h
index 037f2a0..bb0ea94 100644
--- a/android/android-jni/jni/image_pool.h
+++ b/android/android-jni/jni/image_pool.h
@@ -9,7 +9,7 @@ using namespace cv;
 extern "C" {
 #endif
 
-
+JNIEXPORT jint JNI_OnLoad(JavaVM* vm, void* reserved);
 //
 //JNIEXPORT jobject JNICALL Java_com_opencv_jni_opencvJNI_getBitmapBuffer(
 //		JNIEnv *jenv, jclass jcls, jlong jarg1, jobject jarg1_);
-- 
2.7.4