aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-06-23 22:56:21 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-23 22:56:21 +0000
commit6c6cd71d67d1ffd86df1e160dee8ccf04c860108 (patch)
tree652164081d871a663583077b90a6b7c51ff16b1d
parentf8d28130c2d6736ff23ca8e89d01f6a1502c48bf (diff)
parent5f72fe526dfeb3b1d1e920df45249407ce87521c (diff)
downloadconfigs-6c6cd71d67d1ffd86df1e160dee8ccf04c860108.tar.gz
Merge "Require CONFIG_ANDROID_BINDERFS for R launching devices." into rvc-dev am: 5f72fe526dandroid-mainline-11.0.0_r35
Original change: https://googleplex-android-review.googlesource.com/c/kernel/configs/+/11917347 Change-Id: I281765ccb988f20fc671ace1af91ff089b6bf8ce
-rw-r--r--r/android-4.14/android-base.config1
-rw-r--r--r/android-4.19/android-base.config1
-rw-r--r--r/android-5.4/android-base.config1
3 files changed, 3 insertions, 0 deletions
diff --git a/r/android-4.14/android-base.config b/r/android-4.14/android-base.config
index 04b6f5f..542251b 100644
--- a/r/android-4.14/android-base.config
+++ b/r/android-4.14/android-base.config
@@ -17,6 +17,7 @@ CONFIG_AIO=y
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
CONFIG_ASHMEM=y
CONFIG_AUDIT=y
CONFIG_BINFMT_ELF=y
diff --git a/r/android-4.19/android-base.config b/r/android-4.19/android-base.config
index aee6ce0..f942b8e 100644
--- a/r/android-4.19/android-base.config
+++ b/r/android-4.19/android-base.config
@@ -19,6 +19,7 @@ CONFIG_AIO=y
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
CONFIG_ASHMEM=y
CONFIG_AUDIT=y
CONFIG_BINFMT_ELF=y
diff --git a/r/android-5.4/android-base.config b/r/android-5.4/android-base.config
index 0b1bda2..08cfbb9 100644
--- a/r/android-5.4/android-base.config
+++ b/r/android-5.4/android-base.config
@@ -19,6 +19,7 @@ CONFIG_AIO=y
CONFIG_ANDROID=y
CONFIG_ANDROID_BINDER_DEVICES="binder,hwbinder,vndbinder"
CONFIG_ANDROID_BINDER_IPC=y
+CONFIG_ANDROID_BINDERFS=y
CONFIG_ASHMEM=y
CONFIG_AUDIT=y
CONFIG_BINFMT_ELF=y