summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinux Build Service Account <lnxbuild@localhost>2017-04-14 22:59:22 -0700
committerGerrit - the friendly Code Review server <code-review@localhost>2017-04-14 22:59:22 -0700
commitaf5e331c32a8a787aa2c847a10f399139bebe7e3 (patch)
tree0d92abe66b161cefe86cc29b519eb13b49ab62b0
parent8c5d1ccf42ffbb609decac27ab1dbded9feba0ed (diff)
parente418f40d94a27774228b065f9c2c9cfd5b8f2083 (diff)
Merge "ANDROID: binder: add hwbinder,vndbinder to BINDER_DEVICES."
-rw-r--r--android/configs/android-base.cfg1
-rw-r--r--drivers/android/Kconfig2
2 files changed, 2 insertions, 1 deletions
diff --git a/android/configs/android-base.cfg b/android/configs/android-base.cfg
index f10371a981b7..7f672485f9c2 100644
--- a/android/configs/android-base.cfg
+++ b/android/configs/android-base.cfg
@@ -7,6 +7,7 @@
# CONFIG_SYSVIPC is not set
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDER_DEVICES=binder,hwbinder,vndbinder
CONFIG_ANDROID_LOW_MEMORY_KILLER=y
CONFIG_ARMV8_DEPRECATED=y
CONFIG_ASHMEM=y
diff --git a/drivers/android/Kconfig b/drivers/android/Kconfig
index a82fc022d34b..4d4cdc1a6e25 100644
--- a/drivers/android/Kconfig
+++ b/drivers/android/Kconfig
@@ -22,7 +22,7 @@ config ANDROID_BINDER_IPC
config ANDROID_BINDER_DEVICES
string "Android Binder devices"
depends on ANDROID_BINDER_IPC
- default "binder"
+ default "binder,hwbinder,vndbinder"
---help---
Default value for the binder.devices parameter.