summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Maciej Żenczykowski <maze@google.com> 2022-02-09 04:44:52 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2022-02-09 04:44:52 +0000
commit577f4a6b99fc5f5c705e34b6659f37c4a30cc00e (patch)
tree36f959b590350c31556d055eb896cc14364bbc57
parente8c55433daa227e0c2de559d5ac8931b2dc22788 (diff)
parent8a5a8bb9d1225d0024189cbefe8bd5d093ae2805 (diff)
Merge "remove needlessly used library libbpf_android" am: 91cf5ef2af am: 6dea9aea2a am: 6fbb73a092 am: 8a5a8bb9d1
Original change: https://android-review.googlesource.com/c/platform/frameworks/native/+/1977547 Change-Id: Iee1a2df85618fecd08d7441205a3657001061e39
-rw-r--r--services/gpuservice/gpumem/Android.bp8
-rw-r--r--services/gpuservice/tests/unittests/Android.bp2
2 files changed, 4 insertions, 6 deletions
diff --git a/services/gpuservice/gpumem/Android.bp b/services/gpuservice/gpumem/Android.bp
index 24087ac9e6..d0ea856fb5 100644
--- a/services/gpuservice/gpumem/Android.bp
+++ b/services/gpuservice/gpumem/Android.bp
@@ -26,19 +26,17 @@ cc_library_shared {
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",
diff --git a/services/gpuservice/tests/unittests/Android.bp b/services/gpuservice/tests/unittests/Android.bp
index 5b69f960a2..4fb0d2e734 100644
--- a/services/gpuservice/tests/unittests/Android.bp
+++ b/services/gpuservice/tests/unittests/Android.bp
@@ -32,10 +32,10 @@ cc_test {
"GpuMemTracerTest.cpp",
"GpuStatsTest.cpp",
],
+ header_libs: ["bpf_headers"],
shared_libs: [
"libbase",
"libbpf_bcc",
- "libbpf_android",
"libcutils",
"libgfxstats",
"libgpumem",