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

Commit db91920d authored by Blagovest Kolenichev's avatar Blagovest Kolenichev
Browse files

Revert "UPSTREAM: ANDROID: binder: remove 32-bit binder interface." 



This reverts commit 61a775a1.

Removal of 32-bit binder interface is mandated from android P platform
onwards. Many targets on msm-4.9 mainline are not using android P
platform, so keep 64-bit binder interface as default for 32-bit and
64-bit targets. For targets requiring 32-bit binder interface, it can
be enabled through respective defconfig.

Change-Id: I16cd053c90a811f9830ae6efec40a2650a10df9b
Signed-off-by: default avatarBlagovest Kolenichev <bkolenichev@codeaurora.org>
parent 7f6f94c9

drivers/android/Kconfig

+14 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ if ANDROID 


config ANDROID_BINDER_IPC

	bool "Android Binder IPC Driver"

	depends on MMU && !M68K

	depends on MMU

	default n

	---help---

	  Binder is used in Android for both communication between processes,
@@ -31,6 +31,19 @@ config ANDROID_BINDER_DEVICES 
	  created. Each binder device has its own context manager, and is

	  therefore logically separated from the other devices.



config ANDROID_BINDER_IPC_32BIT

	bool

	depends on !64BIT && ANDROID_BINDER_IPC

	default y

	---help---

	  The Binder API has been changed to support both 32 and 64bit

	  applications in a mixed environment.



	  Enable this to support an old 32-bit Android user-space (v4.4 and

	  earlier).



	  Note that enabling this will break newer Android user-space.



config ANDROID_BINDER_IPC_SELFTEST

	bool "Android Binder IPC Driver Selftest"

	depends on ANDROID_BINDER_IPC

drivers/android/binder.c

+4 −0
Original line number Diff line number Diff line
@@ -71,6 +71,10 @@ 
#include <linux/security.h>

#include <linux/spinlock.h>



#ifdef CONFIG_ANDROID_BINDER_IPC_32BIT

#define BINDER_IPC_32BIT 1

#endif



#include <uapi/linux/android/binder.h>

#include "binder_alloc.h"

#include "binder_trace.h"