From 4a259ab940be494d458d52736ce9e20f14536b3a Mon Sep 17 00:00:00 2001 From: Chenbo Feng Date: Mon, 15 Oct 2018 17:31:43 -0700 Subject: [PATCH] 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 --- core/jni/com_android_internal_net_NetworkStatsFactory.cpp | 2 +- .../core/jni/com_android_server_net_NetworkStatsService.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/core/jni/com_android_internal_net_NetworkStatsFactory.cpp b/core/jni/com_android_internal_net_NetworkStatsFactory.cpp index 109e65c4a1..b3ff4dbf8b 100644 --- a/core/jni/com_android_internal_net_NetworkStatsFactory.cpp +++ b/core/jni/com_android_internal_net_NetworkStatsFactory.cpp @@ -32,8 +32,8 @@ #include #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/com_android_server_net_NetworkStatsService.cpp b/services/core/jni/com_android_server_net_NetworkStatsService.cpp index 3302dea535..649f1a56f0 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 #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;