commit 8dc9366b7fbf5e4181ae5fe551d4da954d83799a
author Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Dec 18 13:05:28 2021 +0000
committer Android Build Coastguard Worker <android-build-coastguard-worker@google.com> Sat Dec 18 13:05:28 2021 +0000
tree da1c14900f4d0f8902a7458679e8ede82384fbb2
parent ab0ee80351238f3756bc4925eec00f684112715d
parent 9dd0cbbea3712be0b48a091110f30ba462412de7

Snap for 8013394 from 9dd0cbbea3712be0b48a091110f30ba462412de7 to mainline-media-swcodec-release

Change-Id: I68cf24e538e6711ece78605c5379ac14d4f42ad4

libs/cputimeinstate/Android.bp

diff --git a/libs/cputimeinstate/Android.bp b/libs/cputimeinstate/Android.bp
index 570af71..1fd2c62 100644
--- a/libs/cputimeinstate/Android.bp
+++ b/libs/cputimeinstate/Android.bp
@@ -12,7 +12,7 @@
     srcs: ["cputimeinstate.cpp"],
     shared_libs: [
         "libbase",
-        "libbpf",
+        "libbpf_bcc",
         "libbpf_android",
         "liblog",
         "libnetdutils"
@@ -31,7 +31,7 @@
     srcs: ["testtimeinstate.cpp"],
     shared_libs: [
         "libbase",
-        "libbpf",
+        "libbpf_bcc",
         "libbpf_android",
         "libtimeinstate",
         "libnetdutils",

services/gpuservice/gpumem/Android.bp

diff --git a/services/gpuservice/gpumem/Android.bp b/services/gpuservice/gpumem/Android.bp
index 830e53d..24087ac 100644
--- a/services/gpuservice/gpumem/Android.bp
+++ b/services/gpuservice/gpumem/Android.bp
@@ -28,7 +28,7 @@
     ],
     shared_libs: [
         "libbase",
-        "libbpf",
+        "libbpf_bcc",
         "libbpf_android",
         "libcutils",
         "liblog",

services/gpuservice/tests/unittests/Android.bp

diff --git a/services/gpuservice/tests/unittests/Android.bp b/services/gpuservice/tests/unittests/Android.bp
index 6d87c45..5b69f96 100644
--- a/services/gpuservice/tests/unittests/Android.bp
+++ b/services/gpuservice/tests/unittests/Android.bp
@@ -34,7 +34,7 @@
     ],
     shared_libs: [
         "libbase",
-        "libbpf",
+        "libbpf_bcc",
         "libbpf_android",
         "libcutils",
         "libgfxstats",