commit 04229c84531621bec1d9a8c8791159a9888b3b38
author Maciej Żenczykowski <maze@google.com> Sat Oct 21 02:18:05 2023 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Sat Oct 21 02:18:05 2023 +0000
tree 9846f1b171f63e0da277e276ef5e471a76d6a257
parent e5cdeb21d19635de9757af0b4b4e32c2d5079dcd
parent ab8fd4c4f6d407359f62ad2a85411a780a2c31ec

Merge "reverse bpfloader vs netbpfload order" into main

bpfloader/BpfLoader.cpp

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;
 }

bpfloader/bpfloader.rc

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