Rename libbpf to libbpf_android
Rename the bpf support library in android to libbpf_android to make
it compatible with external bcc project. Fix the Android.bp file to
prevent build break.
Bug: 112334572
Test: No build breakage.
Change-Id: I24ae8aaf8ca8afdded5e46d21f0deec68d6030da
diff --git a/bpfloader/Android.bp b/bpfloader/Android.bp
index 48189e0..eea547d 100644
--- a/bpfloader/Android.bp
+++ b/bpfloader/Android.bp
@@ -32,7 +32,7 @@
clang: true,
shared_libs: [
"libcutils",
- "libbpf",
+ "libbpf_android",
"libbase",
"liblog",
"libnetdbpf",
diff --git a/libbpf/Android.bp b/libbpf_android/Android.bp
similarity index 88%
rename from libbpf/Android.bp
rename to libbpf_android/Android.bp
index 4bf151a..2ffacf3 100644
--- a/libbpf/Android.bp
+++ b/libbpf_android/Android.bp
@@ -15,7 +15,7 @@
//
cc_library_headers {
- name: "libbpf_headers",
+ name: "libbpf_android_headers",
vendor_available: false,
host_supported: false,
export_include_dirs: ["include"],
@@ -27,7 +27,7 @@
}
cc_library {
- name: "libbpf",
+ name: "libbpf_android",
vendor_available: false,
host_supported: false,
target: {
@@ -48,9 +48,9 @@
"libnetdutils",
],
header_libs: [
- "libbpf_headers"
+ "libbpf_android_headers"
],
- export_header_lib_headers: ["libbpf_headers"],
+ export_header_lib_headers: ["libbpf_android_headers"],
local_include_dirs: ["include"],
defaults: ["bpf_defaults"],
@@ -62,7 +62,7 @@
}
cc_test {
- name: "libbpf_test",
+ name: "libbpf_android_test",
srcs: [
"BpfMapTest.cpp",
],
@@ -74,7 +74,7 @@
],
static_libs: ["libgmock"],
shared_libs: [
- "libbpf",
+ "libbpf_android",
"libbase",
"liblog",
"libnetdutils",
diff --git a/libbpf/BpfMapTest.cpp b/libbpf_android/BpfMapTest.cpp
similarity index 100%
rename from libbpf/BpfMapTest.cpp
rename to libbpf_android/BpfMapTest.cpp
diff --git a/libbpf/BpfUtils.cpp b/libbpf_android/BpfUtils.cpp
similarity index 100%
rename from libbpf/BpfUtils.cpp
rename to libbpf_android/BpfUtils.cpp
diff --git a/libbpf/include/bpf/BpfMap.h b/libbpf_android/include/bpf/BpfMap.h
similarity index 100%
rename from libbpf/include/bpf/BpfMap.h
rename to libbpf_android/include/bpf/BpfMap.h
diff --git a/libbpf/include/bpf/BpfUtils.h b/libbpf_android/include/bpf/BpfUtils.h
similarity index 100%
rename from libbpf/include/bpf/BpfUtils.h
rename to libbpf_android/include/bpf/BpfUtils.h