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

Commit 8ac70c42 authored by Jeff Sharkey's avatar Jeff Sharkey Committed by Android (Google) Code Review
Browse files

Merge "Split Parcel JNI details away from Binder."

parents d10a5992 d84e1ce0

core/jni/Android.mk

+1 −0
Original line number Diff line number Diff line
@@ -64,6 +64,7 @@ LOCAL_SRC_FILES:= \ 
	android_os_MemoryFile.cpp \

	android_os_MessageQueue.cpp \

	android_os_ParcelFileDescriptor.cpp \

	android_os_Parcel.cpp \

	android_os_Power.cpp \

	android_os_StatFs.cpp \

	android_os_SystemClock.cpp \

core/jni/AndroidRuntime.cpp

+2 −0
Original line number Diff line number Diff line
@@ -130,6 +130,7 @@ extern int register_android_nio_utils(JNIEnv* env); 
extern int register_android_text_format_Time(JNIEnv* env);

extern int register_android_os_Debug(JNIEnv* env);

extern int register_android_os_MessageQueue(JNIEnv* env);

extern int register_android_os_Parcel(JNIEnv* env);

extern int register_android_os_ParcelFileDescriptor(JNIEnv *env);

extern int register_android_os_Power(JNIEnv *env);

extern int register_android_os_StatFs(JNIEnv *env);
@@ -1094,6 +1095,7 @@ static const RegJNIRec gRegJNI[] = { 
    REG_JNI(register_android_os_Process),

    REG_JNI(register_android_os_SystemProperties),

    REG_JNI(register_android_os_Binder),

    REG_JNI(register_android_os_Parcel),

    REG_JNI(register_android_view_Display),

    REG_JNI(register_android_view_DisplayEventReceiver),

    REG_JNI(register_android_nio_utils),

core/jni/android/graphics/Bitmap.cpp

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#include "SkUnPreMultiply.h"



#include <binder/Parcel.h>

#include "android_os_Parcel.h"

#include "android_util_Binder.h"

#include "android_nio_utils.h"

#include "CreateJavaOutputStreamAdaptor.h"

core/jni/android/graphics/Region.cpp

+1 −0
Original line number Diff line number Diff line
@@ -19,6 +19,7 @@ 
#include "GraphicsJNI.h"



#include <binder/Parcel.h>

#include "android_os_Parcel.h"

#include "android_util_Binder.h"



#include <jni.h>

core/jni/android_database_CursorWindow.cpp

+1 −0
Original line number Diff line number Diff line
@@ -31,6 +31,7 @@ 
#include <unistd.h>



#include <androidfw/CursorWindow.h>

#include "android_os_Parcel.h"

#include "android_util_Binder.h"

#include "android_database_SQLiteCommon.h"