diff options
| author | 2018-10-15 17:31:43 -0700 | |
|---|---|---|
| committer | 2018-10-17 03:46:35 +0000 | |
| commit | 5bb4fea967b404399f4916a5f61d34f9329519eb (patch) | |
| tree | c2577fb9843b52d9387addfa012fd7837a10ff72 | |
| parent | 22fe21df93312e65ea344a7476f4b14c12f88941 (diff) | |
Move bpf project to system/bpf
The bpf project now have a new project directory in system/bpf instead
of inside netd. The network related bpf library is renamed to
libnetdbpf. Fix the dependency issue in framework to make sure no
regression.
Test: -m CtsNetTestCases -t android.net.cts.TrafficStatsTest
Bug: 112334572
Change-Id: Ibd477bf17d18d516aa520fb1569f4a395ef9abf0
| -rw-r--r-- | core/jni/Android.bp | 1 | ||||
| -rw-r--r-- | core/jni/com_android_internal_net_NetworkStatsFactory.cpp | 2 | ||||
| -rw-r--r-- | services/core/jni/Android.bp | 1 | ||||
| -rw-r--r-- | services/core/jni/com_android_server_net_NetworkStatsService.cpp | 2 |
4 files changed, 4 insertions, 2 deletions
diff --git a/core/jni/Android.bp b/core/jni/Android.bp index 08c9678cac79..d1a7d7007d3e 100644 --- a/core/jni/Android.bp +++ b/core/jni/Android.bp @@ -233,6 +233,7 @@ cc_library_shared { shared_libs: [ "libbpf", + "libnetdbpf", "libnetdutils", "libmemtrack", "libandroidfw", diff --git a/core/jni/com_android_internal_net_NetworkStatsFactory.cpp b/core/jni/com_android_internal_net_NetworkStatsFactory.cpp index 109e65c4a1d0..b3ff4dbf8bef 100644 --- a/core/jni/com_android_internal_net_NetworkStatsFactory.cpp +++ b/core/jni/com_android_internal_net_NetworkStatsFactory.cpp @@ -32,8 +32,8 @@ #include <utils/misc.h> #include "android-base/unique_fd.h" -#include "bpf/BpfNetworkStats.h" #include "bpf/BpfUtils.h" +#include "netdbpf/BpfNetworkStats.h" using android::bpf::hasBpfSupport; using android::bpf::parseBpfNetworkStatsDetail; diff --git a/services/core/jni/Android.bp b/services/core/jni/Android.bp index 07cdd05ca893..902bafb8cfd5 100644 --- a/services/core/jni/Android.bp +++ b/services/core/jni/Android.bp @@ -97,6 +97,7 @@ cc_defaults { "libutils", "libhwui", "libbpf", + "libnetdbpf", "libnetdutils", "android.hardware.audio.common@2.0", "android.hardware.broadcastradio@1.0", diff --git a/services/core/jni/com_android_server_net_NetworkStatsService.cpp b/services/core/jni/com_android_server_net_NetworkStatsService.cpp index 3302dea53506..649f1a56f011 100644 --- a/services/core/jni/com_android_server_net_NetworkStatsService.cpp +++ b/services/core/jni/com_android_server_net_NetworkStatsService.cpp @@ -30,8 +30,8 @@ #include <utils/Log.h> #include "android-base/unique_fd.h" -#include "bpf/BpfNetworkStats.h" #include "bpf/BpfUtils.h" +#include "netdbpf/BpfNetworkStats.h" using android::bpf::Stats; using android::bpf::hasBpfSupport; |