commit 56b8a95ea4591b2124ebaa4348dfc1f719bab3ab
author android-build-team Robot <android-build-team-robot@google.com> Sat Jun 15 23:17:39 2019 +0000
committer android-build-team Robot <android-build-team-robot@google.com> Sat Jun 15 23:17:39 2019 +0000
tree b2bc5e1ee0c03ad028ac3ccfd1917416181f61d9
parent 5fe026a927b26d63fd8227d67a925b5541c5fb79
parent d9787c2aa4668f26c71745a6ded109e2bd8f9836

Snap for 5663715 from d9787c2aa4668f26c71745a6ded109e2bd8f9836 to qt-c2f2-release

Change-Id: Id3e4aff784c300ab87a55271783a4bd4dfedaa97

bpfloader/bpfloader.rc

diff --git a/bpfloader/bpfloader.rc b/bpfloader/bpfloader.rc
index 7ac145d..31747fb 100644
--- a/bpfloader/bpfloader.rc
+++ b/bpfloader/bpfloader.rc
@@ -1,6 +1,9 @@
 service bpfloader /system/bin/bpfloader
     class main
     capabilities SYS_ADMIN
-    # Set RLIMIT_MEMLOCK to 8MB for bpfloader
-    rlimit memlock 8388608 8388608
+    # Set RLIMIT_MEMLOCK to 64MB for bpfloader
+    # Actually only 8MB is needed, but since bpfloader runs as root, it shares
+    # the global rlimit. Once bpfloader is running as its own user in the
+    # future, it will have dedicated rlimit to itself and this can be 8MB.
+    rlimit memlock 67108864 67108864
     oneshot