commit 4c91638009cee703efbd590ed7af3d1067d8eadd
author Maciej Żenczykowski <maze@google.com> Mon May 15 02:53:32 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 15 02:53:32 2023 +0000
tree 78596b16c0bdbb52c13d29d37884492231d57b5b
parent af9fac5e8dfc04426263dde6420ea9160f8dc899
parent ae366ac3fe235e5f9c9e098f07e6df91d9ba32d8

remove inprocess tethering am: 48cd823681 am: 8dce22ac34 am: ae366ac3fe

Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/23214402

Change-Id: I9a4a979acdc76891bb86d3eff6c11b867fb79028
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>

bpfloader/BpfLoader.cpp

diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
index ac9ca43..fe51ed5 100644
--- a/bpfloader/BpfLoader.cpp
+++ b/bpfloader/BpfLoader.cpp
@@ -258,9 +258,6 @@
         return 1;
     }
 
-    // Tethering mainline module must provide this or U bpfloader will fail to boot.
-    if (!exists("/apex/com.android.tethering/etc/flag/out-of-process")) return 1;
-
     // Linux 5.16-rc1 changed the default to 2 (disabled but changeable), but we need 0 (enabled)
     // (this writeFile is known to fail on at least 4.19, but always defaults to 0 on pre-5.13,
     // on 5.13+ it depends on CONFIG_BPF_UNPRIV_DEFAULT_OFF)