commit 3a2224fd426dec09439370240b1087f34d55671a
author Maciej Żenczykowski <maze@google.com> Fri Apr 24 04:47:47 2020 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Apr 24 04:47:47 2020 +0000
tree 51c77b72381ffbf9ac1a0b4d67b5f0be1390daaa
parent 39ab9d3ff75fd2ae711c72a0a623808bc7479769
parent fa1f6204492d50d6da918c5377ed5426931ca74d

Merge "change to ro.kernel.ebpf.supported property" am: fa1f620449

Change-Id: I47a6d30af20f06de70c8383265f343f1e3a0700a

libbpf_android/BpfUtils.cpp

diff --git a/libbpf_android/BpfUtils.cpp b/libbpf_android/BpfUtils.cpp
index 97b3363..3b6c764 100644
--- a/libbpf_android/BpfUtils.cpp
+++ b/libbpf_android/BpfUtils.cpp
@@ -138,8 +138,8 @@
     if (kver >= KVER(4, 14, 0)) return BpfLevel::EXTENDED_4_14;
 
     // Override for devices launched with O but now on a 4.9-P+ kernel.
-    bool has_ebpf = base::GetBoolProperty("ro.product.kernel_has_ebpf", false);
-    if (has_ebpf) return BpfLevel::BASIC_4_9;
+    bool ebpf_supported = base::GetBoolProperty("ro.kernel.ebpf.supported", false);
+    if (ebpf_supported) return BpfLevel::BASIC_4_9;
 
     uint64_t api_level = base::GetUintProperty<uint64_t>("ro.product.first_api_level", 0);
     if (api_level == 0) {