commit 327faf118f29d78ef564e88e61dfb9b751ef407e
author Maciej Żenczykowski <maze@google.com> Tue Feb 08 21:01:31 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 08 21:01:31 2022 +0000
tree b2432922f964425c8d073ec3457e72e9a61218ea
parent e86742b0d244e4a2c63b1a35aa6ff56194df8f52
parent 7429fcb8421ce0cd134bca8cc9141f5b64417ad1

Merge "remove libbpf_android_headers target" am: 7429fcb842

Original change: https://android-review.googlesource.com/c/platform/system/bpf/+/1976929

Change-Id: I71748826874f6e715c80193d3830a337a60e034f

libbpf_android/Android.bp

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: [