From bb48217acd435cc404bd75e3ab2cce5bc3dce122 Mon Sep 17 00:00:00 2001 From: Chih-Wei Huang Date: Mon, 11 Jun 2018 18:12:39 +0800 Subject: [PATCH] Fix issues to use 64-bit binder on 32-bit image Fixes: 66fd14a3 (Always use 64-bit binder) Reported-and-Tested-by: Mauro Rossi --- BoardConfig.mk | 2 +- selinux_diffconfig | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/BoardConfig.mk b/BoardConfig.mk index 7d71496..2c03a77 100644 --- a/BoardConfig.mk +++ b/BoardConfig.mk @@ -76,7 +76,7 @@ ifneq ($(strip $(BOARD_GPU_DRIVERS)),) TARGET_HARDWARE_3D := true endif -BOARD_KERNEL_CMDLINE := root=/dev/ram0 androidboot.selinux=permissive $(if $(filter true,$(TARGET_USES_64_BIT_BINDER)),,vmalloc=192M) +BOARD_KERNEL_CMDLINE := root=/dev/ram0 androidboot.selinux=permissive $(if $(filter x86_64,$(TARGET_ARCH) $(TARGET_KERNEL_ARCH)),,vmalloc=192M) TARGET_KERNEL_DIFFCONFIG := device/generic/common/selinux_diffconfig COMPATIBILITY_ENHANCEMENT_PACKAGE := true diff --git a/selinux_diffconfig b/selinux_diffconfig index 807ed71..4fe6c38 100644 --- a/selinux_diffconfig +++ b/selinux_diffconfig @@ -5,3 +5,4 @@ CONFIG_SECURITY_SELINUX_CHECKREQPROT_VALUE=1 CONFIG_DEFAULT_SECURITY_SELINUX=y # CONFIG_DEFAULT_SECURITY_DAC is not set CONFIG_DEFAULT_SECURITY="selinux" +# CONFIG_ANDROID_BINDER_IPC_32BIT is not set -- 2.11.0