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

Commit 3169e4bd authored by Mathias Agopian's avatar Mathias Agopian Committed by Android (Google) Code Review
Browse files

Merge "move CursorWindow from libbinder to libandroidfw"

parents 6f9d697d 49d2b186

core/jni/android_database_CursorWindow.cpp

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

#include <unistd.h>



#include "binder/CursorWindow.h"

#include <androidfw/CursorWindow.h>

#include "android_util_Binder.h"

#include "android_database_SQLiteCommon.h"

core/jni/android_database_SQLiteConnection.cpp

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

#include <unistd.h>



#include "binder/CursorWindow.h"

#include <androidfw/CursorWindow.h>



#include <sqlite3.h>

#include <sqlite3_android.h>

libs/androidfw/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -67,6 +67,7 @@ LOCAL_SRC_FILES:= \ 
	$(commonSources) \

	BackupData.cpp \

	BackupHelpers.cpp \

    CursorWindow.cpp \

	InputTransport.cpp



LOCAL_SHARED_LIBRARIES := \

libs/binder/CursorWindow.cpp→libs/androidfw/CursorWindow.cpp

+1 −1
Original line number Diff line number Diff line
@@ -18,7 +18,7 @@ 
#define LOG_TAG "CursorWindow"



#include <utils/Log.h>

#include <binder/CursorWindow.h>

#include <androidfw/CursorWindow.h>



#include <cutils/ashmem.h>

#include <sys/mman.h>