| commit | 026704ae9cf26d26e14c825d7f01a888756cb707 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Sat Oct 21 02:18:43 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 21 02:18:43 2023 +0000 |
| tree | 9846f1b171f63e0da277e276ef5e471a76d6a257 | |
| parent | 06752826fbc66fa13c47aa13015cc80c59e7fc65 [diff] | |
| parent | 04229c84531621bec1d9a8c8791159a9888b3b38 [diff] |
Merge "reverse bpfloader vs netbpfload order" into main am: 04229c8453 Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2794731 Change-Id: I475331b69ff9900fda18d3496f3cbf485bea4fae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp index 8d8ae4f..f153b40 100644 --- a/bpfloader/BpfLoader.cpp +++ b/bpfloader/BpfLoader.cpp
@@ -227,5 +227,10 @@ } } + if (android::base::SetProperty("bpf.progs_loaded", "1") == false) { + ALOGE("Failed to set bpf.progs_loaded property"); + return 1; + } + return 0; }
diff --git a/bpfloader/bpfloader.rc b/bpfloader/bpfloader.rc index 1f7f815..95f8a61 100644 --- a/bpfloader/bpfloader.rc +++ b/bpfloader/bpfloader.rc
@@ -15,8 +15,8 @@ # considered to have booted successfully. # on load_bpf_programs - exec_start bpfloader exec_start netbpfload + exec_start bpfloader service bpfloader /system/bin/bpfloader capabilities CHOWN SYS_ADMIN