diff options
author | Maciej Żenczykowski <maze@google.com> | 2021-12-16 15:26:52 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2021-12-16 15:26:52 +0000 |
commit | 9dd0cbbea3712be0b48a091110f30ba462412de7 (patch) | |
tree | da1c14900f4d0f8902a7458679e8ede82384fbb2 | |
parent | 8a6cca2934db5cea3cc39799a3f238fb9594fd03 (diff) | |
parent | 946f2dead352a3708e70391701556a5f0437eeb7 (diff) | |
download | native-9dd0cbbea3712be0b48a091110f30ba462412de7.tar.gz |
Merge "DO NOT MERGE Rename libbpf to libbpf_bcc" into sc-mainline-prod
-rw-r--r-- | libs/cputimeinstate/Android.bp | 4 | ||||
-rw-r--r-- | services/gpuservice/gpumem/Android.bp | 2 | ||||
-rw-r--r-- | services/gpuservice/tests/unittests/Android.bp | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/libs/cputimeinstate/Android.bp b/libs/cputimeinstate/Android.bp index 570af71d9a..1fd2c62772 100644 --- a/libs/cputimeinstate/Android.bp +++ b/libs/cputimeinstate/Android.bp @@ -12,7 +12,7 @@ cc_library { srcs: ["cputimeinstate.cpp"], shared_libs: [ "libbase", - "libbpf", + "libbpf_bcc", "libbpf_android", "liblog", "libnetdutils" @@ -31,7 +31,7 @@ cc_test { srcs: ["testtimeinstate.cpp"], shared_libs: [ "libbase", - "libbpf", + "libbpf_bcc", "libbpf_android", "libtimeinstate", "libnetdutils", diff --git a/services/gpuservice/gpumem/Android.bp b/services/gpuservice/gpumem/Android.bp index 830e53d534..24087ac9e6 100644 --- a/services/gpuservice/gpumem/Android.bp +++ b/services/gpuservice/gpumem/Android.bp @@ -28,7 +28,7 @@ cc_library_shared { ], shared_libs: [ "libbase", - "libbpf", + "libbpf_bcc", "libbpf_android", "libcutils", "liblog", diff --git a/services/gpuservice/tests/unittests/Android.bp b/services/gpuservice/tests/unittests/Android.bp index 6d87c45921..5b69f960a2 100644 --- a/services/gpuservice/tests/unittests/Android.bp +++ b/services/gpuservice/tests/unittests/Android.bp @@ -34,7 +34,7 @@ cc_test { ], shared_libs: [ "libbase", - "libbpf", + "libbpf_bcc", "libbpf_android", "libcutils", "libgfxstats", |