commit 102f93a5dac0199f13bf629513eb95459e4dbf95
author Maciej Żenczykowski <maze@google.com> Tue Jan 25 02:31:59 2022 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Tue Jan 25 02:31:59 2022 +0000
tree 69fc0e9a6b13bb2f42aa5e9d494bf35fa8cb6f76
parent 5ffd6bb828e69f2aea4a4bcc819d8221f6f52c3a
parent 35425e5a884342b6b3ce50d990080288e3b3140b

Merge "bpfloader: load map BTF via btfloader"

bpfloader/BpfLoader.cpp

diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
index 7a68894..1fc44f4 100644
--- a/bpfloader/BpfLoader.cpp
+++ b/bpfloader/BpfLoader.cpp
@@ -55,11 +55,16 @@
     const char* const dir;
     const char* const prefix;
 } locations[] = {
-        // Tethering mainline module
+        // Tethering mainline module: tether offload
         {
                 .dir = "/apex/com.android.tethering/etc/bpf/",
                 .prefix = "tethering/",
         },
+        // Tethering mainline module: netd, clatd, ...etc
+        {
+                .dir = "/apex/com.android.tethering/etc/bpf/net_shared/",
+                .prefix = "",
+        },
         // Core operating system
         {
                 .dir = "/system/etc/bpf/",

libbpf_android/Loader.cpp

diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index b10cfe7..cad5950 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/Loader.cpp
@@ -30,9 +30,9 @@
 #include <sys/wait.h>
 #include <unistd.h>
 
-// This is BpfLoader v0.8
+// This is BpfLoader v0.9
 #define BPFLOADER_VERSION_MAJOR 0u
-#define BPFLOADER_VERSION_MINOR 8u
+#define BPFLOADER_VERSION_MINOR 9u
 #define BPFLOADER_VERSION ((BPFLOADER_VERSION_MAJOR << 16) | BPFLOADER_VERSION_MINOR)
 
 #include "bpf/BpfUtils.h"