commit 474eb0baa098e2378be84f8157744e12eaa53847
author Connor O'Brien <connoro@google.com> Mon Nov 22 17:45:40 2021 -0800
committer Connor O'Brien <connoro@google.com> Thu Dec 16 13:16:05 2021 -0800
tree 3fc3325d6ef8c9301e7a6b90b49c3f4f0fb8ee0c
parent 18af0633726ef015f60cca3ed9195dd5798107c5

Rename libbpf to libbpf_bcc

This is to prevent a name collision with "upstream"
libbpf (external/libbpf) which is built using the same name.

Bug: 203823368
Test: build cuttlefish
Test: m libbpf_load_test
Signed-off-by: Connor O'Brien <connoro@google.com>
Change-Id: I9bb798a9b5d832511bed471f01575bba14a1a9d3

bpfloader/Android.bp

diff --git a/bpfloader/Android.bp b/bpfloader/Android.bp
index c754e8d..d88108d 100644
--- a/bpfloader/Android.bp
+++ b/bpfloader/Android.bp
@@ -46,7 +46,7 @@
         "libbase",
         "liblog",
         "libnetdutils",
-        "libbpf",
+        "libbpf_bcc",
     ],
     srcs: [
         "BpfLoader.cpp",

libbpf_android/Android.bp

diff --git a/libbpf_android/Android.bp b/libbpf_android/Android.bp
index 7ab4c47..ca46510 100644
--- a/libbpf_android/Android.bp
+++ b/libbpf_android/Android.bp
@@ -58,7 +58,7 @@
         "libbase",
         "libutils",
         "liblog",
-        "libbpf",
+        "libbpf_bcc",
     ],
     header_libs: [
         "bpf_map_utils",
@@ -68,7 +68,7 @@
         "libbpf_android_headers",
         "bpf_map_utils",
     ],
-    export_shared_lib_headers: ["libbpf"],
+    export_shared_lib_headers: ["libbpf_bcc"],
     local_include_dirs: ["include"],
 
     defaults: ["bpf_defaults"],
@@ -94,7 +94,7 @@
     static_libs: ["libgmock"],
     shared_libs: [
         "libbpf_android",
-        "libbpf",
+        "libbpf_bcc",
         "libbase",
         "liblog",
         "libutils",