diff options
| -rw-r--r-- | core/jni/Android.mk | 1 | ||||
| -rw-r--r-- | core/jni/android_database_CursorWindow.cpp | 2 | ||||
| -rw-r--r-- | core/jni/android_database_SQLiteQuery.cpp | 2 | ||||
| -rw-r--r-- | include/binder/CursorWindow.h (renamed from core/jni/CursorWindow.h) | 2 | ||||
| -rw-r--r-- | libs/binder/Android.mk | 1 | ||||
| -rw-r--r-- | libs/binder/CursorWindow.cpp (renamed from core/jni/CursorWindow.cpp) | 7 |
6 files changed, 4 insertions, 11 deletions
diff --git a/core/jni/Android.mk b/core/jni/Android.mk index dbad7e9..170a32f 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 91449bc..fba6f0f 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 4427168..747ee50 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 index 3fcb560..bda0d31 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 13dc500..f9d9f25 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 index 7877921..20b27c9 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) : |