From 2807df89af680e46cb35ee0035bb10b42d3136a2 Mon Sep 17 00:00:00 2001
From: Mike Lockwood <lockwood@android.com>
Date: Thu, 27 May 2010 17:04:23 -0400
Subject: [PATCH] Move CursorWindow class from core/jni to libbinder

To allow use of the native CursorWindow class outside of the core framework jni

Change-Id: I72e8dcb91a2c691130c33cdfd9a25d343da1c592
Signed-off-by: Mike Lockwood <lockwood@android.com>
---
 core/jni/Android.mk                         | 1 -
 core/jni/android_database_CursorWindow.cpp  | 2 +-
 core/jni/android_database_SQLiteQuery.cpp   | 2 +-
 {core/jni => include/binder}/CursorWindow.h | 2 --
 libs/binder/Android.mk                      | 1 +
 {core/jni => libs/binder}/CursorWindow.cpp  | 7 +------
 6 files changed, 4 insertions(+), 11 deletions(-)
 rename {core/jni => include/binder}/CursorWindow.h (99%)
 rename {core/jni => libs/binder}/CursorWindow.cpp (99%)

diff --git a/core/jni/Android.mk b/core/jni/Android.mk
index dbad7e98b1fdf..170a32f9c6b0d 100644
--- a/core/jni/Android.mk
+++ b/core/jni/Android.mk
@@ -24,7 +24,6 @@ LOCAL_CFLAGS += -DGL_GLEXT_PROTOTYPES -DEGL_EGLEXT_PROTOTYPES
 LOCAL_SRC_FILES:= \
 	ActivityManager.cpp \
 	AndroidRuntime.cpp \
-	CursorWindow.cpp \
 	Time.cpp \
 	com_google_android_gles_jni_EGLImpl.cpp \
 	com_google_android_gles_jni_GLImpl.cpp.arm \
diff --git a/core/jni/android_database_CursorWindow.cpp b/core/jni/android_database_CursorWindow.cpp
index 91449bc565ef8..fba6f0f668fae 100644
--- a/core/jni/android_database_CursorWindow.cpp
+++ b/core/jni/android_database_CursorWindow.cpp
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "CursorWindow.h"
+#include "binder/CursorWindow.h"
 #include "sqlite3_exception.h"
 #include "android_util_Binder.h"
 
diff --git a/core/jni/android_database_SQLiteQuery.cpp b/core/jni/android_database_SQLiteQuery.cpp
index 442716838ac36..747ee500a59dd 100644
--- a/core/jni/android_database_SQLiteQuery.cpp
+++ b/core/jni/android_database_SQLiteQuery.cpp
@@ -29,7 +29,7 @@
 #include <string.h>
 #include <unistd.h>
 
-#include "CursorWindow.h"
+#include "binder/CursorWindow.h"
 #include "sqlite3_exception.h"
 
 
diff --git a/core/jni/CursorWindow.h b/include/binder/CursorWindow.h
similarity index 99%
rename from core/jni/CursorWindow.h
rename to include/binder/CursorWindow.h
index 3fcb560227207..bda0d31fb9c79 100644
--- a/core/jni/CursorWindow.h
+++ b/include/binder/CursorWindow.h
@@ -24,8 +24,6 @@
 #include <binder/IMemory.h>
 #include <utils/RefBase.h>
 
-#include <jni.h>
-
 #define DEFAULT_WINDOW_SIZE 4096
 #define MAX_WINDOW_SIZE (1024 * 1024)
 #define WINDOW_ALLOCATION_SIZE 4096
diff --git a/libs/binder/Android.mk b/libs/binder/Android.mk
index 13dc500d9445a..f9d9f25922918 100644
--- a/libs/binder/Android.mk
+++ b/libs/binder/Android.mk
@@ -16,6 +16,7 @@
 sources := \
     Binder.cpp \
     BpBinder.cpp \
+    CursorWindow.cpp \
     IInterface.cpp \
     IMemory.cpp \
     IPCThreadState.cpp \
diff --git a/core/jni/CursorWindow.cpp b/libs/binder/CursorWindow.cpp
similarity index 99%
rename from core/jni/CursorWindow.cpp
rename to libs/binder/CursorWindow.cpp
index 78779214b6ed1..20b27c9eb9480 100644
--- a/core/jni/CursorWindow.cpp
+++ b/libs/binder/CursorWindow.cpp
@@ -18,6 +18,7 @@
 #define LOG_TAG "CursorWindow"
 
 #include <utils/Log.h>
+#include <binder/CursorWindow.h>
 #include <binder/MemoryHeapBase.h>
 #include <binder/MemoryBase.h>
 
@@ -25,12 +26,6 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include <jni.h>
-#include <JNIHelp.h>
-
-#include "CursorWindow.h"
-
-
 namespace android {
 
 CursorWindow::CursorWindow(size_t maxSize) :