Merge "Move bpf project to system/bpf"

am: 1006d271cc

Change-Id: I0a96a2abd66fd0cca4b49d773a6990a59134128a

core/jni/Android.bp

@@ -233,6 +233,7 @@ cc_library_shared {
 
     shared_libs: [
         "libbpf",
+        "libnetdbpf",
         "libnetdutils",
         "libmemtrack",
         "libandroidfw",

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;

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",

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;