commit b0506c4f7d3a6af244a162971e69c2df1155bca5
author Maciej Żenczykowski <maze@google.com> Tue Feb 08 12:46:06 2022 -0800
committer Maciej Żenczykowski <maze@google.com> Tue Feb 08 13:46:26 2022 -0800
tree c046a4e44c932d833c9574db33577b4e8d987a56
parent fb0f43019f8e67ca844fb91e2bfc0487862c85a9

remove needlessly used library libbpf_android

Test: TreeHugger, m libgpumem gpuservice_unittest
Signed-off-by: Maciej Żenczykowski <maze@google.com>
Change-Id: If52eabe9430f70d3b4962b97a5b955ebba5bca37

services/gpuservice/gpumem/Android.bp

diff --git a/services/gpuservice/gpumem/Android.bp b/services/gpuservice/gpumem/Android.bp
index 24087ac..d0ea856 100644
--- a/services/gpuservice/gpumem/Android.bp
+++ b/services/gpuservice/gpumem/Android.bp
@@ -26,19 +26,17 @@
     srcs: [
         "GpuMem.cpp",
     ],
+    header_libs: ["bpf_headers"],
     shared_libs: [
         "libbase",
         "libbpf_bcc",
-        "libbpf_android",
         "libcutils",
         "liblog",
         "libutils",
     ],
     export_include_dirs: ["include"],
-    export_shared_lib_headers: [
-        "libbase",
-        "libbpf_android",
-    ],
+    export_header_lib_headers: ["bpf_headers"],
+    export_shared_lib_headers: ["libbase"],
     cppflags: [
         "-Wall",
         "-Werror",

services/gpuservice/tests/unittests/Android.bp

diff --git a/services/gpuservice/tests/unittests/Android.bp b/services/gpuservice/tests/unittests/Android.bp
index 5b69f96..4fb0d2e 100644
--- a/services/gpuservice/tests/unittests/Android.bp
+++ b/services/gpuservice/tests/unittests/Android.bp
@@ -32,10 +32,10 @@
         "GpuMemTracerTest.cpp",
         "GpuStatsTest.cpp",
     ],
+    header_libs: ["bpf_headers"],
     shared_libs: [
         "libbase",
         "libbpf_bcc",
-        "libbpf_android",
         "libcutils",
         "libgfxstats",
         "libgpumem",