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

libnetdutils/Android.bp

diff --git a/libnetdutils/Android.bp b/libnetdutils/Android.bp
index 7952742..f06087a 100644
--- a/libnetdutils/Android.bp
+++ b/libnetdutils/Android.bp
@@ -18,7 +18,6 @@
     cflags: ["-Wall", "-Werror"],
     shared_libs: [
         "libbase",
-        "libbinder",
         "liblog",
     ],
     export_shared_lib_headers: [

libnetdutils/Status.cpp

diff --git a/libnetdutils/Status.cpp b/libnetdutils/Status.cpp
index 6c2f734..acd8f11 100644
--- a/libnetdutils/Status.cpp
+++ b/libnetdutils/Status.cpp
@@ -31,13 +31,6 @@
     return status.code() == err;
 }
 
-binder::Status asBinderStatus(const netdutils::Status& status) {
-    if (isOk(status)) {
-        return binder::Status::ok();
-    }
-    return binder::Status::fromServiceSpecificError(status.code(), status.msg().c_str());
-}
-
 std::string toString(const Status& status) {
     std::stringstream ss;
     ss << status;

libnetdutils/include/netdutils/Log.h

diff --git a/libnetdutils/include/netdutils/Log.h b/libnetdutils/include/netdutils/Log.h
index 2e94fdf..77ae649 100644
--- a/libnetdutils/include/netdutils/Log.h
+++ b/libnetdutils/include/netdutils/Log.h
@@ -22,6 +22,7 @@
 #include <shared_mutex>
 #include <string>
 #include <type_traits>
+#include <vector>
 
 #include <android-base/stringprintf.h>
 #include <android-base/thread_annotations.h>

libnetdutils/include/netdutils/Status.h

diff --git a/libnetdutils/include/netdutils/Status.h b/libnetdutils/include/netdutils/Status.h
index 2433670..b3a5d01 100644
--- a/libnetdutils/include/netdutils/Status.h
+++ b/libnetdutils/include/netdutils/Status.h
@@ -17,7 +17,6 @@
 #ifndef NETUTILS_STATUS_H
 #define NETUTILS_STATUS_H
 
-#include "binder/Status.h"
 #include <cassert>
 #include <ostream>
 
@@ -91,9 +90,6 @@
 // value in the errno space.
 bool equalToErrno(const Status& status, int err);
 
-// Converts netdutils Status into binder Status.
-binder::Status asBinderStatus(const netdutils::Status& status);
-
 // Helper that converts Status-like object (notably StatusOr) to a
 // message.
 std::string toString(const Status& status);