Merge "Update Loader.cpp for updated bcc"
diff --git a/libbpf_android/Android.bp b/libbpf_android/Android.bp
index 3b58c00..abda8b8 100644
--- a/libbpf_android/Android.bp
+++ b/libbpf_android/Android.bp
@@ -59,6 +59,7 @@
"libutils",
"liblog",
"libbpf_bcc",
+ "libbpf_minimal",
],
header_libs: [
"bpf_headers",
@@ -95,6 +96,7 @@
shared_libs: [
"libbpf_android",
"libbpf_bcc",
+ "libbpf_minimal",
"libbase",
"liblog",
"libutils",
diff --git a/libbpf_android/Loader.cpp b/libbpf_android/Loader.cpp
index 74a1ee6..ec251fb 100644
--- a/libbpf_android/Loader.cpp
+++ b/libbpf_android/Loader.cpp
@@ -575,7 +575,7 @@
// programs as being 5.4+...
type = BPF_MAP_TYPE_HASH;
}
- fd.reset(bpf_create_map(type, mapNames[i].c_str(), md[i].key_size, md[i].value_size,
+ fd.reset(bcc_create_map(type, mapNames[i].c_str(), md[i].key_size, md[i].value_size,
md[i].max_entries, md[i].map_flags));
saved_errno = errno;
ALOGD("bpf_create_map name %s, ret: %d\n", mapNames[i].c_str(), fd.get());
@@ -724,7 +724,7 @@
} else {
vector<char> log_buf(BPF_LOAD_LOG_SZ, 0);
- fd = bpf_prog_load(cs[i].type, name.c_str(), (struct bpf_insn*)cs[i].data.data(),
+ fd = bcc_prog_load(cs[i].type, name.c_str(), (struct bpf_insn*)cs[i].data.data(),
cs[i].data.size(), license.c_str(), kvers, 0, log_buf.data(),
log_buf.size());
ALOGD("bpf_prog_load lib call for %s (%s) returned fd: %d (%s)\n", elfPath,