commit 72bc068da9c0b9975a2002e25a8eda383da7638b
author Maciej Żenczykowski <maze@google.com> Mon May 15 17:57:40 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Mon May 15 17:57:40 2023 +0000
tree 78596b16c0bdbb52c13d29d37884492231d57b5b
parent 4e9f9b0ef70f39336cc1778a21ab3a3815f46a10
parent e15e91ea0d4c3b82a3e9fa1a93deaf5ca850b470

remove inprocess tethering am: e15e91ea0d

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

Change-Id: I0f5fe75cf3d1141684b8852ebd316630c93acce5
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)