diff options
| author | Connor O'Brien <connoro@google.com> | 2021-11-22 18:02:36 -0800 |
|---|---|---|
| committer | Connor O'Brien <connoro@google.com> | 2021-12-08 00:44:20 +0000 |
| commit | 946f2dead352a3708e70391701556a5f0437eeb7 (patch) | |
| tree | 5ac7b002d096a7449388ed52762edb8645939ff2 | |
| parent | 7ebff4afa91ae2fd5bb3380c84ea31cd91a2df9c (diff) | |
| download | native-946f2dead352a3708e70391701556a5f0437eeb7.tar.gz | |
DO NOT MERGE Rename libbpf to libbpf_bcc
This is to prevent a name collision with "upstream"
libbpf (external/libbpf) which is built using the same name.
Bug: 203823368
Test: build cuttlefish
Signed-off-by: Connor O'Brien <connoro@google.com>
Change-Id: I8fa2b21d331ecdeabd0e0a1a9f495f29ff967623
| -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", |