commit 0cb8b5ca7a899ad70f4d81cee6fa18006282516c
author Maciej Żenczykowski <maze@google.com> Wed Jan 15 02:29:18 2020 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> Wed Jan 15 02:29:18 2020 +0000
tree 429f63830c74af80d70620bda4f1655ac6563405
parent cd6f89bbb6caaf4a1c3b7398cbbf6d56399b50a6
parent cdeb9203af4896adb2d00cd3394bf741d1bee103

Merge "libbpf_load_test: fix map location"

libbpf_android/Android.bp

diff --git a/libbpf_android/Android.bp b/libbpf_android/Android.bp
index 956fd93..7f8bd38 100644
--- a/libbpf_android/Android.bp
+++ b/libbpf_android/Android.bp
@@ -111,4 +111,5 @@
     required: [
         "bpf_load_tp_prog.o",
     ],
+    require_root: true,
 }

libbpf_android/BpfLoadTest.cpp

diff --git a/libbpf_android/BpfLoadTest.cpp b/libbpf_android/BpfLoadTest.cpp
index cae60f0..6d637e9 100644
--- a/libbpf_android/BpfLoadTest.cpp
+++ b/libbpf_android/BpfLoadTest.cpp
@@ -27,7 +27,7 @@
 
 constexpr const char tp_prog_path[] =
         "/sys/fs/bpf/prog_bpf_load_tp_prog_tracepoint_sched_sched_switch";
-constexpr const char tp_map_path[] = "/sys/fs/bpf/map_bpf_load_tp_prog_cpu_pid";
+constexpr const char tp_map_path[] = "/sys/fs/bpf/map_bpf_load_tp_prog_cpu_pid_map";
 
 namespace android {
 namespace bpf {