Merge "Revert "Revert "R+: Require _POSIX_ACL."""
diff --git a/android-4.14/android-base-conditional.xml b/android-4.14/android-base-conditional.xml
index 400dc24..83c1634 100644
--- a/android-4.14/android-base-conditional.xml
+++ b/android-4.14/android-base-conditional.xml
@@ -63,6 +63,10 @@
<key>CONFIG_SWP_EMULATION</key>
<value type="bool">y</value>
</config>
+ <config>
+ <key>CONFIG_BPF_JIT_ALWAYS_ON</key>
+ <value type="bool">y</value>
+ </config>
</group>
<!-- x86 base requirements -->
@@ -85,6 +89,10 @@
<key>CONFIG_RETPOLINE</key>
<value type="bool">y</value>
</config>
+ <config>
+ <key>CONFIG_BPF_JIT_ALWAYS_ON</key>
+ <value type="bool">y</value>
+ </config>
</group>
<!-- CONFIG_ACPI || CONFIG_OF -->
diff --git a/android-4.14/android-base.config b/android-4.14/android-base.config
index 3b0b0e0..6bfb9ec 100644
--- a/android-4.14/android-base.config
+++ b/android-4.14/android-base.config
@@ -19,6 +19,7 @@
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
@@ -27,7 +28,6 @@
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLOCK=y
CONFIG_BPF_JIT=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
CONFIG_BPF_SYSCALL=y
CONFIG_CC_STACKPROTECTOR_STRONG=y
CONFIG_CGROUPS=y
@@ -222,6 +222,7 @@
CONFIG_SND=y
CONFIG_SOUND=y
CONFIG_STAGING=y
+CONFIG_STATIC_USERMODEHELPER=y
CONFIG_STRICT_KERNEL_RWX=y
CONFIG_STRICT_MODULE_RWX=y
CONFIG_SUSPEND=y
@@ -247,6 +248,7 @@
CONFIG_USB_GADGET=y
CONFIG_USB_SUPPORT=y
CONFIG_UTS_NS=y
+CONFIG_VETH=y
CONFIG_XFRM_INTERFACE=y
CONFIG_XFRM_STATISTICS=y
CONFIG_XFRM_USER=y
diff --git a/android-4.19/android-base-conditional.xml b/android-4.19/android-base-conditional.xml
index 5a26b34..c945965 100644
--- a/android-4.19/android-base-conditional.xml
+++ b/android-4.19/android-base-conditional.xml
@@ -63,6 +63,10 @@
<key>CONFIG_SWP_EMULATION</key>
<value type="bool">y</value>
</config>
+ <config>
+ <key>CONFIG_BPF_JIT_ALWAYS_ON</key>
+ <value type="bool">y</value>
+ </config>
</group>
<!-- x86 base requirements -->
@@ -85,6 +89,10 @@
<key>CONFIG_RETPOLINE</key>
<value type="bool">y</value>
</config>
+ <config>
+ <key>CONFIG_BPF_JIT_ALWAYS_ON</key>
+ <value type="bool">y</value>
+ </config>
</group>
<!-- CONFIG_ACPI || CONFIG_OF -->
diff --git a/android-4.19/android-base.config b/android-4.19/android-base.config
index 58630fe..42c7513 100644
--- a/android-4.19/android-base.config
+++ b/android-4.19/android-base.config
@@ -20,6 +20,7 @@
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
@@ -28,7 +29,6 @@
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLOCK=y
CONFIG_BPF_JIT=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
CONFIG_BPF_SYSCALL=y
CONFIG_CGROUPS=y
CONFIG_CGROUP_BPF=y
@@ -222,6 +222,7 @@
CONFIG_STACKPROTECTOR=y
CONFIG_STACKPROTECTOR_STRONG=y
CONFIG_STAGING=y
+CONFIG_STATIC_USERMODEHELPER=y
CONFIG_STRICT_KERNEL_RWX=y
CONFIG_STRICT_MODULE_RWX=y
CONFIG_SUSPEND=y
@@ -247,6 +248,7 @@
CONFIG_USB_GADGET=y
CONFIG_USB_SUPPORT=y
CONFIG_UTS_NS=y
+CONFIG_VETH=y
CONFIG_XFRM_INTERFACE=y
CONFIG_XFRM_STATISTICS=y
CONFIG_XFRM_USER=y
diff --git a/android-5.4/android-base-conditional.xml b/android-5.4/android-base-conditional.xml
index 65e4298..dc9021a 100644
--- a/android-5.4/android-base-conditional.xml
+++ b/android-5.4/android-base-conditional.xml
@@ -67,6 +67,10 @@
<key>CONFIG_SWP_EMULATION</key>
<value type="bool">y</value>
</config>
+ <config>
+ <key>CONFIG_BPF_JIT_ALWAYS_ON</key>
+ <value type="bool">y</value>
+ </config>
</group>
<!-- x86 base requirements -->
@@ -89,6 +93,10 @@
<key>CONFIG_RETPOLINE</key>
<value type="bool">y</value>
</config>
+ <config>
+ <key>CONFIG_BPF_JIT_ALWAYS_ON</key>
+ <value type="bool">y</value>
+ </config>
</group>
<!-- CONFIG_ACPI || CONFIG_OF -->
diff --git a/android-5.4/android-base.config b/android-5.4/android-base.config
index c789314..efa0c42 100644
--- a/android-5.4/android-base.config
+++ b/android-5.4/android-base.config
@@ -20,6 +20,7 @@
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
@@ -28,7 +29,6 @@
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLOCK=y
CONFIG_BPF_JIT=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
CONFIG_BPF_SYSCALL=y
CONFIG_CFI_CLANG=y
CONFIG_CGROUPS=y
@@ -221,6 +221,7 @@
CONFIG_STACKPROTECTOR=y
CONFIG_STACKPROTECTOR_STRONG=y
CONFIG_STAGING=y
+CONFIG_STATIC_USERMODEHELPER=y
CONFIG_STRICT_KERNEL_RWX=y
CONFIG_STRICT_MODULE_RWX=y
CONFIG_SUSPEND=y
@@ -246,6 +247,7 @@
CONFIG_USB_GADGET=y
CONFIG_USB_SUPPORT=y
CONFIG_UTS_NS=y
+CONFIG_VETH=y
CONFIG_XFRM_INTERFACE=y
CONFIG_XFRM_STATISTICS=y
CONFIG_XFRM_USER=y
diff --git a/r/android-4.14/android-base-conditional.xml b/r/android-4.14/android-base-conditional.xml
index 400dc24..83c1634 100644
--- a/r/android-4.14/android-base-conditional.xml
+++ b/r/android-4.14/android-base-conditional.xml
@@ -63,6 +63,10 @@
<key>CONFIG_SWP_EMULATION</key>
<value type="bool">y</value>
</config>
+ <config>
+ <key>CONFIG_BPF_JIT_ALWAYS_ON</key>
+ <value type="bool">y</value>
+ </config>
</group>
<!-- x86 base requirements -->
@@ -85,6 +89,10 @@
<key>CONFIG_RETPOLINE</key>
<value type="bool">y</value>
</config>
+ <config>
+ <key>CONFIG_BPF_JIT_ALWAYS_ON</key>
+ <value type="bool">y</value>
+ </config>
</group>
<!-- CONFIG_ACPI || CONFIG_OF -->
diff --git a/r/android-4.14/android-base.config b/r/android-4.14/android-base.config
index c2d90d7..04b6f5f 100644
--- a/r/android-4.14/android-base.config
+++ b/r/android-4.14/android-base.config
@@ -25,7 +25,6 @@
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLOCK=y
CONFIG_BPF_JIT=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
CONFIG_BPF_SYSCALL=y
CONFIG_CC_STACKPROTECTOR_STRONG=y
CONFIG_CGROUPS=y
@@ -220,6 +219,7 @@
CONFIG_SND=y
CONFIG_SOUND=y
CONFIG_STAGING=y
+CONFIG_STATIC_USERMODEHELPER=y
CONFIG_STRICT_KERNEL_RWX=y
CONFIG_STRICT_MODULE_RWX=y
CONFIG_SUSPEND=y
@@ -244,6 +244,7 @@
CONFIG_USB_GADGET=y
CONFIG_USB_SUPPORT=y
CONFIG_UTS_NS=y
+CONFIG_VETH=y
CONFIG_XFRM_INTERFACE=y
CONFIG_XFRM_STATISTICS=y
CONFIG_XFRM_USER=y
diff --git a/r/android-4.19/android-base-conditional.xml b/r/android-4.19/android-base-conditional.xml
index 5a26b34..c945965 100644
--- a/r/android-4.19/android-base-conditional.xml
+++ b/r/android-4.19/android-base-conditional.xml
@@ -63,6 +63,10 @@
<key>CONFIG_SWP_EMULATION</key>
<value type="bool">y</value>
</config>
+ <config>
+ <key>CONFIG_BPF_JIT_ALWAYS_ON</key>
+ <value type="bool">y</value>
+ </config>
</group>
<!-- x86 base requirements -->
@@ -85,6 +89,10 @@
<key>CONFIG_RETPOLINE</key>
<value type="bool">y</value>
</config>
+ <config>
+ <key>CONFIG_BPF_JIT_ALWAYS_ON</key>
+ <value type="bool">y</value>
+ </config>
</group>
<!-- CONFIG_ACPI || CONFIG_OF -->
diff --git a/r/android-4.19/android-base.config b/r/android-4.19/android-base.config
index 7959b32..aee6ce0 100644
--- a/r/android-4.19/android-base.config
+++ b/r/android-4.19/android-base.config
@@ -27,7 +27,6 @@
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLOCK=y
CONFIG_BPF_JIT=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
CONFIG_BPF_SYSCALL=y
CONFIG_CGROUPS=y
CONFIG_CGROUP_BPF=y
@@ -221,6 +220,7 @@
CONFIG_STACKPROTECTOR=y
CONFIG_STACKPROTECTOR_STRONG=y
CONFIG_STAGING=y
+CONFIG_STATIC_USERMODEHELPER=y
CONFIG_STRICT_KERNEL_RWX=y
CONFIG_STRICT_MODULE_RWX=y
CONFIG_SUSPEND=y
@@ -245,6 +245,7 @@
CONFIG_USB_GADGET=y
CONFIG_USB_SUPPORT=y
CONFIG_UTS_NS=y
+CONFIG_VETH=y
CONFIG_XFRM_INTERFACE=y
CONFIG_XFRM_STATISTICS=y
CONFIG_XFRM_USER=y
diff --git a/r/android-5.4/android-base-conditional.xml b/r/android-5.4/android-base-conditional.xml
index 46773ed..fc60730 100644
--- a/r/android-5.4/android-base-conditional.xml
+++ b/r/android-5.4/android-base-conditional.xml
@@ -63,6 +63,10 @@
<key>CONFIG_SWP_EMULATION</key>
<value type="bool">y</value>
</config>
+ <config>
+ <key>CONFIG_BPF_JIT_ALWAYS_ON</key>
+ <value type="bool">y</value>
+ </config>
</group>
<!-- x86 base requirements -->
@@ -85,6 +89,10 @@
<key>CONFIG_RETPOLINE</key>
<value type="bool">y</value>
</config>
+ <config>
+ <key>CONFIG_BPF_JIT_ALWAYS_ON</key>
+ <value type="bool">y</value>
+ </config>
</group>
<!-- CONFIG_ACPI || CONFIG_OF -->
diff --git a/r/android-5.4/android-base.config b/r/android-5.4/android-base.config
index e0513a5..c5e4410 100644
--- a/r/android-5.4/android-base.config
+++ b/r/android-5.4/android-base.config
@@ -27,7 +27,6 @@
CONFIG_BLK_DEV_LOOP=y
CONFIG_BLOCK=y
CONFIG_BPF_JIT=y
-CONFIG_BPF_JIT_ALWAYS_ON=y
CONFIG_BPF_SYSCALL=y
CONFIG_CGROUPS=y
CONFIG_CGROUP_BPF=y
@@ -218,6 +217,7 @@
CONFIG_STACKPROTECTOR=y
CONFIG_STACKPROTECTOR_STRONG=y
CONFIG_STAGING=y
+CONFIG_STATIC_USERMODEHELPER=y
CONFIG_STRICT_KERNEL_RWX=y
CONFIG_STRICT_MODULE_RWX=y
CONFIG_SUSPEND=y
@@ -242,6 +242,7 @@
CONFIG_USB_GADGET=y
CONFIG_USB_SUPPORT=y
CONFIG_UTS_NS=y
+CONFIG_VETH=y
CONFIG_XFRM_INTERFACE=y
CONFIG_XFRM_STATISTICS=y
CONFIG_XFRM_USER=y
