commit c04c69fed31f478766b14ca93f0ffacd62c51977
author Maciej Żenczykowski <maze@google.com> Fri Jul 14 19:09:16 2023 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Jul 14 19:09:16 2023 +0000
tree cb0088f6d4cbb67c1c9112966fe1cdc020885735
parent bfb38761fd29e4eee591baa5d6be868cc3db663e
parent 5070df963d7b89543edd5be37b41c4797b52c394

bpfloader: Android V requires kernel 4.19+ am: 6002cbedb1 am: abc8303ffe am: 5070df963d

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

Change-Id: Ia093479ee3bc550c4c800546bb40d9cfac0a5f55
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 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'",