diff options
| author | Maciej Żenczykowski <maze@google.com> | 2020-06-15 10:50:43 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-15 10:50:43 +0000 |
| commit | b7feff2c6a9f17e1e623bf4b3b757cf8351a7b0e (patch) | |
| tree | 0732d7bdc74a6d5531dd34f36454eb5ec5a83b6f /libbpf_android/Loader.cpp | |
| parent | c0ccdf30c058433400d0ffe656254270a821bc9c (diff) | |
| parent | d16be56e731fd82ea803cd35c74e431cefbce3c3 (diff) | |
| download | bpf-b7feff2c6a9f17e1e623bf4b3b757cf8351a7b0e.tar.gz | |
only set 'bpf.progs_loaded' property on eBPF capable devices... am: 007c9dd245 am: d16be56e73
Original change: https://googleplex-android-review.googlesource.com/c/platform/system/bpf/+/11859849
Change-Id: I75ae16f3ebc871c33501f60f199bd72998a43eb0
Diffstat (limited to 'libbpf_android/Loader.cpp')
| -rw-r--r-- | libbpf_android/Loader.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp index f808dc6..4244eb7 100644 --- a/libbpf_android/Loader.cpp +++ b/libbpf_android/Loader.cpp @@ -650,6 +650,8 @@ int loadProg(const char* elfPath) { } void waitForProgsLoaded() { + if (!android::bpf::isBpfSupported()) return; + while (!android::base::WaitForProperty("bpf.progs_loaded", "1", std::chrono::seconds(5))) { ALOGW("Waited 5s for bpf.progs_loaded, still waiting..."); } |