commit 8fd90ad372a5f75ed23ca8a784432689939f67c2
author Treehugger Robot <treehugger-gerrit@google.com> Tue Feb 08 23:59:57 2022 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Tue Feb 08 23:59:57 2022 +0000
tree 8042876252f0a41f714e7a754fc75c370b05309c
parent 34bd0392681e910abb175f6fa39b647c6fda200b
parent a6df542b8aa267f0e34c7e71fb57ad1322eed95a

Merge "remove needlessly used libraries libbpf_android & libnetdutils" am: 62d7a8e2fe am: a9a9b80272 am: ff03d40e83 am: a6df542b8a

Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1977407

Change-Id: I441a75307785ae333186f1b998840e9531e6d5d4

libs/cputimeinstate/Android.bp

diff --git a/libs/cputimeinstate/Android.bp b/libs/cputimeinstate/Android.bp
index 4f63194..79cc15f 100644
--- a/libs/cputimeinstate/Android.bp
+++ b/libs/cputimeinstate/Android.bp
@@ -13,12 +13,13 @@
     shared_libs: [
         "libbase",
         "libbpf_bcc",
-        "libbpf_android",
         "libbpf_minimal",
         "liblog",
-        "libnetdutils"
     ],
-    header_libs: ["bpf_prog_headers"],
+    header_libs: [
+        "bpf_prog_headers",
+        "bpf_headers",
+    ],
     cflags: [
         "-Werror",
         "-Wall",
@@ -33,12 +34,13 @@
     shared_libs: [
         "libbase",
         "libbpf_bcc",
-        "libbpf_android",
         "libbpf_minimal",
         "libtimeinstate",
-        "libnetdutils",
     ],
-    header_libs: ["bpf_prog_headers"],
+    header_libs: [
+        "bpf_prog_headers",
+        "bpf_headers",
+    ],
     cflags: [
         "-Werror",
         "-Wall",