commit 52067468319d263225a31d225065c13f01cb6c68
author Maciej Żenczykowski <maze@google.com> Fri Apr 24 07:18:59 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Fri Apr 24 07:18:59 2020 +0000
tree 1fe368ac5805cdfaaae975ee8f620ddb1eaef756
parent fa1f6204492d50d6da918c5377ed5426931ca74d
parent 6c7871b8dfc1ac4bfec84f1a483aee16f5acc91d

Merge "libbpf_android/Loader.cpp - fixes performance-inefficient-string-concatenation warning"

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) {