commit e31377bf30ad0cdabf5865b00c92db33d383ef47
author TreeHugger Robot <treehugger-gerrit@google.com> Fri Feb 11 06:42:18 2022 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Fri Feb 11 06:42:18 2022 +0000
tree c8d05a34770187ff5219ffe7727c4e097ed8639c
parent ea17733868104b139916717f0541f69f8768b3d7
parent 47106307cb68e9c934c095e95152bc057204b559

Merge "remove needlessly used library libbpf_android"

services/gpuservice/gpuwork/Android.bp

diff --git a/services/gpuservice/gpuwork/Android.bp b/services/gpuservice/gpuwork/Android.bp
index 89b31a6..a9a59bc 100644
--- a/services/gpuservice/gpuwork/Android.bp
+++ b/services/gpuservice/gpuwork/Android.bp
@@ -22,13 +22,13 @@
         "GpuWork.cpp",
     ],
     header_libs: [
+        "bpf_headers",
         "gpu_work_structs",
     ],
     shared_libs: [
         "libbase",
         "libbinder",
         "libbpf_bcc",
-        "libbpf_android",
         "libcutils",
         "liblog",
         "libstatslog",
@@ -43,7 +43,6 @@
     ],
     export_shared_lib_headers: [
         "libbase",
-        "libbpf_android",
         "libstatspull",
     ],
     cppflags: [

services/gpuservice/gpuwork/GpuWork.cpp

diff --git a/services/gpuservice/gpuwork/GpuWork.cpp b/services/gpuservice/gpuwork/GpuWork.cpp
index e7b1cd4..67ce9f2 100644
--- a/services/gpuservice/gpuwork/GpuWork.cpp
+++ b/services/gpuservice/gpuwork/GpuWork.cpp
@@ -24,7 +24,6 @@
 #include <binder/PermissionCache.h>
 #include <bpf/WaitForProgsLoaded.h>
 #include <libbpf.h>
-#include <libbpf_android.h>
 #include <log/log.h>
 #include <random>
 #include <stats_event.h>