commit aeb79f42dcb131e2e4b8417c5537914458a9e20f
author Maciej Żenczykowski <maze@google.com> Tue Sep 12 22:16:12 2023 +0000
committer Maciej Żenczykowski <maze@google.com> Tue Sep 12 22:16:41 2023 +0000
tree cb0088f6d4cbb67c1c9112966fe1cdc020885735
parent 2733d9768303c3fa1e217b1fa0977276be611a27

bpfloader: Android V requires kernel 4.19+

(This is a reland of
https://android-review.git.corp.google.com/c/platform/system/bpf/+/2657155
sunfish is EOL)

This reverts commit 2733d9768303c3fa1e217b1fa0977276be611a27.

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

bpfloader/BpfLoader.cpp

diff --git a/bpfloader/BpfLoader.cpp b/bpfloader/BpfLoader.cpp
index fe51ed5..e1dbd06 100644
--- a/bpfloader/BpfLoader.cpp
+++ b/bpfloader/BpfLoader.cpp
@@ -251,6 +251,11 @@
     (void)argc;
     android::base::InitLogging(argv, &android::base::KernelLogger);
 
+    if (!android::bpf::isAtLeastKernelVersion(4, 19, 0)) {
+        ALOGE("Android V requires kernel 4.19.");
+        return 1;
+    }
+
     // Ensure we can determine the Android build type.
     if (!android::bpf::isEng() && !android::bpf::isUser() && !android::bpf::isUserdebug()) {
         ALOGE("Failed to determine the build type: got %s, want 'eng', 'user', or 'userdebug'",