Merge "Move bpf project to system/bpf" am: 1006d271cc

am: d271be0e1c

Change-Id: I9c0592365844836dc644d6e090def32af3edf678
This commit is contained in:
Chenbo Feng
2018-10-18 08:12:41 -07:00
committed by android-build-merger
2 changed files with 2 additions and 2 deletions

View File

@@ -32,8 +32,8 @@
#include <utils/misc.h> #include <utils/misc.h>
#include "android-base/unique_fd.h" #include "android-base/unique_fd.h"
#include "bpf/BpfNetworkStats.h"
#include "bpf/BpfUtils.h" #include "bpf/BpfUtils.h"
#include "netdbpf/BpfNetworkStats.h"
using android::bpf::hasBpfSupport; using android::bpf::hasBpfSupport;
using android::bpf::parseBpfNetworkStatsDetail; using android::bpf::parseBpfNetworkStatsDetail;

View File

@@ -30,8 +30,8 @@
#include <utils/Log.h> #include <utils/Log.h>
#include "android-base/unique_fd.h" #include "android-base/unique_fd.h"
#include "bpf/BpfNetworkStats.h"
#include "bpf/BpfUtils.h" #include "bpf/BpfUtils.h"
#include "netdbpf/BpfNetworkStats.h"
using android::bpf::Stats; using android::bpf::Stats;
using android::bpf::hasBpfSupport; using android::bpf::hasBpfSupport;