remove libbpf_android_headers target
target just doesn't make sense any more,
since any user of the headers, which only declare lib provided functions,
also needs the library itself
Test: TreeHugger
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: I135972468771070b9eab57efe082271f174e8ab3
diff --git a/libbpf_android/Android.bp b/libbpf_android/Android.bp
index 099e9e8..1fac19d 100644
--- a/libbpf_android/Android.bp
+++ b/libbpf_android/Android.bp
@@ -22,22 +22,6 @@
default_applicable_licenses: ["system_bpf_license"],
}
-cc_library_headers {
- name: "libbpf_android_headers",
- vendor_available: false,
- host_supported: false,
- native_bridge_supported: true,
- export_include_dirs: ["include"],
- target: {
- linux_bionic: {
- enabled: true,
- },
- },
- sdk_version: "30",
- header_libs: ["bpf_syscall_wrappers"],
- export_header_lib_headers: ["bpf_syscall_wrappers"],
-}
-
cc_library {
name: "libbpf_android",
vendor_available: false,
@@ -63,14 +47,12 @@
],
header_libs: [
"bpf_headers",
- "libbpf_android_headers",
],
export_header_lib_headers: [
- "libbpf_android_headers",
"bpf_headers",
],
export_shared_lib_headers: ["libbpf_bcc"],
- local_include_dirs: ["include"],
+ export_include_dirs: ["include"],
defaults: ["bpf_defaults"],
cflags: [