diff options
| author | Maciej Żenczykowski <maze@google.com> | 2022-01-24 20:00:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2022-01-24 20:00:38 +0000 |
| commit | 3009d44d2d3092683d4bb03bd7930eceae242043 (patch) | |
| tree | e9a5ad1087af9b6c5b08dad1de0d994e47989280 /libbpf_android | |
| parent | 6d69784cdcdb68e609a8d4efe03819559bea49ca (diff) | |
| parent | 52863b6ba69fec4ff66d766bf3e95bfe1c519e43 (diff) | |
| download | bpf-3009d44d2d3092683d4bb03bd7930eceae242043.tar.gz | |
Merge "Update Loader.cpp for updated bcc"
Diffstat (limited to 'libbpf_android')
| -rw-r--r-- | libbpf_android/Android.bp | 2 | ||||
| -rw-r--r-- | libbpf_android/Loader.cpp | 4 |
2 files changed, 4 insertions, 2 deletions
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 @@ cc_library { "libutils", "liblog", "libbpf_bcc", + "libbpf_minimal", ], header_libs: [ "bpf_headers", @@ -95,6 +96,7 @@ cc_test { 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 @@ static int createMaps(const char* elfPath, ifstream& elfFile, vector<unique_fd>& // 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 @@ static int loadCodeSections(const char* elfPath, vector<codeSection>& cs, const } 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, |