Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 16858d6a authored by Chenbo Feng's avatar Chenbo Feng Committed by android-build-merger
Browse files

Merge "Move bpf project to system/bpf" am: 1006d271 am: fd21f537 

am: 981c3950

Change-Id: I4126f4e184975a387a82ada2b4f432cf20cabbb8
parents f86b0ae8 981c3950

core/jni/Android.bp

+1 −0
Original line number Diff line number Diff line
@@ -239,6 +239,7 @@ cc_library_shared { 


    shared_libs: [

        "libbpf",

        "libnetdbpf",

        "libnetdutils",

        "libmemtrack",

        "libandroidfw",

core/jni/com_android_internal_net_NetworkStatsFactory.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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

+1 −0
Original line number Diff line number Diff line
@@ -99,6 +99,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

+1 −1
Original line number Diff line number Diff line
@@ -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;