Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8eb25c28 authored by Mike Lockwood's avatar Mike Lockwood Committed by Android (Google) Code Review
Browse files

Merge "Move CursorWindow class from core/jni to libbinder"

parents 92228328 2807df89

core/jni/Android.mk

+0 −1
Original line number Diff line number Diff line
@@ -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 \

core/jni/android_database_CursorWindow.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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"

core/jni/android_database_SQLiteQuery.cpp

+1 −1
Original line number Diff line number Diff line
@@ -29,7 +29,7 @@ 
#include <string.h>

#include <unistd.h>



#include "CursorWindow.h"

#include "binder/CursorWindow.h"

#include "sqlite3_exception.h"

core/jni/CursorWindow.h→include/binder/CursorWindow.h

+0 −2
Original line number Diff line number Diff line
@@ -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

libs/binder/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -16,6 +16,7 @@ 
sources := \

    Binder.cpp \

    BpBinder.cpp \

    CursorWindow.cpp \

    IInterface.cpp \

    IMemory.cpp \

    IPCThreadState.cpp \