commit ab8fd4c4f6d407359f62ad2a85411a780a2c31ec
author Maciej Żenczykowski <maze@google.com> Tue Oct 10 16:20:43 2023 -0700
committer Maciej Żenczykowski <maze@google.com> Fri Oct 20 14:12:35 2023 -0700
tree a70e74796d05b55b226c4cb18511a6a33bab4acd
parent c76a0dca67488fe06e1c1bee1b020deb3df3d139

reverse bpfloader vs netbpfload order

in preparation for:
  'service bpfloader' -> netbpfload -> exec -> bpfloader

Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I68c16f4b33b6f09229d449c42d55c10269a361e2

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