joy/android_packages_modules_Connectivity
Watch
1
Fork
You've already forked android_packages_modules_Connectivity
 0
Code Issues Pull requests Projects Releases Wiki Activity

Remove libutils dependency from libservice-connectivity

Browse source 
Remove libutils dependency.

Test: m
Change-Id: I857e40c984bcce2931b5068b3b96d2c9dd69693c
This commit is contained in:
Patrick Rohr 2022-01-31 15:51:09 +01:00
commit 313bc6c2d3
4 changed files with 6 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
service/Android.bp
View file

@ -79,7 +79,6 @@ cc_library_shared {
shared_libs: [
"liblog",
"libnativehelper",
"libutils",
],
apex_available: [
"com.android.tethering",

8
service/jni/com_android_server_BpfNetMaps.cpp
View file

@ -16,17 +16,17 @@
#define LOG_TAG "TrafficControllerJni"
#include "TrafficController.h"
#include <bpf_shared.h>
#include <jni.h>
#include <log/log.h>
#include <nativehelper/JNIHelp.h>
#include <nativehelper/ScopedUtfChars.h>
#include <nativehelper/ScopedPrimitiveArray.h>
#include <net/if.h>
#include <vector>
#include "TrafficController.h"
#include "android-base/logging.h"
#include "bpf_shared.h"
#include "utils/Log.h"
using android::net::TrafficController;
using android::netdutils::Status;

2
service/native/TrafficController.cpp
View file

@ -683,8 +683,6 @@ void dumpBpfMap(const std::string& mapName, DumpWriter& dw, const std::string& h
}
}
const String16 TrafficController::DUMP_KEYWORD = String16("trafficcontroller");
void TrafficController::dump(DumpWriter& dw, bool verbose) {
std::lock_guard guard(mMutex);
ScopedIndent indentTop(dw);

4
service/native/include/TrafficController.h
View file

@ -25,7 +25,6 @@
#include "netdutils/DumpWriter.h"
#include "netdutils/NetlinkListener.h"
#include "netdutils/StatusOr.h"
#include "utils/String16.h"
namespace android {
namespace net {
@ -34,6 +33,8 @@ using netdutils::StatusOr;
class TrafficController {
public:
static constexpr char DUMP_KEYWORD[] = "trafficcontroller";
/*
* Initialize the whole controller
*/
@ -84,7 +85,6 @@ class TrafficController {
netdutils::Status updateUidOwnerMap(const uint32_t uid,
UidOwnerMatchType matchType, IptOp op) EXCLUDES(mMutex);
static const String16 DUMP_KEYWORD;
int toggleUidOwnerMap(ChildChain chain, bool enable) EXCLUDES(mMutex);