commit 97f388fdba793fdd2002df32f3bae1198064312f
author Bernie Innocenti <codewiz@google.com> Tue Oct 16 19:17:08 2018 +0900
committer Bernie Innocenti <codewiz@google.com> Thu Oct 18 13:11:24 2018 +0000
tree 50e0c23f9c9f22ffc87c0ba4e051c9d7b58201bf
parent 2a008c59933b691b14079e84fa075eaef8d07568

libnetdutils: Remove dependency on libbinder

Turns out asBinderStatus() is presently used only in NetdNativeService,
so we can just move it there. This lets us drop the dependency on
libbinder.

Test: atest libnetdutils netd_unit_test
Change-Id: If24a14b881326ec74880ea411973d0acc6ef5ff1

server/InterfaceController.h

diff --git a/server/InterfaceController.h b/server/InterfaceController.h
index 4c5b27f..96b955a 100644
--- a/server/InterfaceController.h
+++ b/server/InterfaceController.h
@@ -18,6 +18,7 @@
 #define _INTERFACE_CONTROLLER_H
 
 #include <functional>
+#include <map>
 #include <string>
 
 #include <netdutils/Status.h>

server/NetdNativeService.cpp

diff --git a/server/NetdNativeService.cpp b/server/NetdNativeService.cpp
index cafb90e..09b7efc 100644
--- a/server/NetdNativeService.cpp
+++ b/server/NetdNativeService.cpp
@@ -104,6 +104,13 @@
 
 #define NETD_BIG_LOCK_RPC(permission) NETD_LOCKING_RPC((permission), gBigNetdLock)
 
+binder::Status asBinderStatus(const netdutils::Status& status) {
+    if (isOk(status)) {
+        return binder::Status::ok();
+    }
+    return binder::Status::fromServiceSpecificError(status.code(), status.msg().c_str());
+}
+
 inline binder::Status statusFromErrcode(int ret) {
     if (ret) {
         return binder::Status::fromServiceSpecificError(-ret, strerror(-ret));

server/TrafficController.h

diff --git a/server/TrafficController.h b/server/TrafficController.h
index e8f66d0..6a9d071 100644
--- a/server/TrafficController.h
+++ b/server/TrafficController.h
@@ -19,7 +19,6 @@
 
 #include <linux/bpf.h>
 
-#include <netdutils/StatusOr.h>
 #include "BandwidthController.h"
 #include "FirewallController.h"
 #include "NetlinkListener.h"
@@ -28,6 +27,8 @@
 #include "android-base/unique_fd.h"
 #include "bpf/BpfMap.h"
 #include "netdbpf/bpf_shared.h"
+#include "netdutils/StatusOr.h"
+#include "utils/String16.h"
 
 using android::bpf::BpfMap;
 using android::bpf::IfaceValue;

server/XfrmController.h

diff --git a/server/XfrmController.h b/server/XfrmController.h
index 851f976..c8a9b7d 100644
--- a/server/XfrmController.h
+++ b/server/XfrmController.h
@@ -27,11 +27,13 @@
 #include <linux/netlink.h>
 #include <linux/udp.h>
 #include <linux/xfrm.h>
-#include <sysutils/SocketClient.h>
+#include <unistd.h>
 
 #include "NetdConstants.h"
+#include "android-base/unique_fd.h"
 #include "netdutils/Slice.h"
 #include "netdutils/Status.h"
+#include "sysutils/SocketClient.h"
 
 namespace android {
 namespace net {