| commit | a7de4e1f052ed06cf86b2dbae7f5ebc112b29799 | [log] [tgz] |
|---|---|---|
| author | Maciej Żenczykowski <maze@google.com> | Sat Oct 21 02:36:20 2023 +0000 |
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | Sat Oct 21 02:36:20 2023 +0000 |
| tree | 9846f1b171f63e0da277e276ef5e471a76d6a257 | |
| parent | 8d8611b955ff66d9009d4b02462725de662fc80f [diff] | |
| parent | 026704ae9cf26d26e14c825d7f01a888756cb707 [diff] |
Merge "reverse bpfloader vs netbpfload order" into main am: 04229c8453 am: 026704ae9c Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/2794731 Change-Id: I2370a5f33c4d28d005826da8c0aeb73b787c3a48 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