summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMaciej Żenczykowski <maze@google.com>2023-05-13 00:58:34 +0000
committerMaciej Żenczykowski <maze@google.com>2023-05-13 01:04:44 +0000
commit48cd8236816ef8d29002fb0c7c66ff480fa3a396 (patch)
tree736a73e9186d7b4d5341b653768eb159a2166627
parentc718d008d85f17ed446f19d1089482eff39b575b (diff)
downloadbpf-48cd8236816ef8d29002fb0c7c66ff480fa3a396.tar.gz
remove inprocess tethering
The logic dealing with in vs out-of-process tethering flags was added in aosp/master once it was already not merging to tm-dev, thus ending up only in udc-dev, it was later removed in aosp/master, and then cherrypicked to udc-dev. As such there is no shipping version of the bpfloader (besides early U developer previews and betas) with this requirement. Ignore-AOSP-First: change must land in U first, since it's not safe if it isn't approved for udc-dev Test: TreeHugger Bug: 279942846 Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: If7c3ca47891d53f478f7b784580efb2a0014c617
-rw-r--r--bpfloader/BpfLoader.cpp3
1 files changed, 0 insertions, 3 deletions
diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
index b4fba5f..e53669a 100644
--- a/bpfloader/BpfLoader.cpp
+++ b/bpfloader/BpfLoader.cpp
@@ -258,9 +258,6 @@ int main(int argc, char** argv) {
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)