Revert "Revert "Update for libbase.""
This reverts commit 4a0ab5ff4a87cfc4a987da99546b01e44875a2e5.
(cherry picked from commit 3e87c785434fdfed2fb00496cb391c411a426bdd)
Change-Id: I042f485f3cc84206766298853491ddd26dbba13f
diff --git a/server/Android.mk b/server/Android.mk
index cdf2599..ecc8829 100644
--- a/server/Android.mk
+++ b/server/Android.mk
@@ -37,6 +37,7 @@
libnetutils \
libnl \
libsysutils \
+ libbase \
libutils \
LOCAL_STATIC_LIBRARIES := \
diff --git a/server/InterfaceController.cpp b/server/InterfaceController.cpp
index 6855bdf..ea7afb2 100644
--- a/server/InterfaceController.cpp
+++ b/server/InterfaceController.cpp
@@ -19,14 +19,17 @@
#include <malloc.h>
#define LOG_TAG "InterfaceController"
+#include <base/file.h>
+#include <base/stringprintf.h>
#include <cutils/log.h>
#include <logwrap/logwrap.h>
-#include <utils/file.h>
-#include <utils/stringprintf.h>
#include "InterfaceController.h"
#include "RouteController.h"
+using android::base::StringPrintf;
+using android::base::WriteStringToFile;
+
const char ipv6_proc_path[] = "/proc/sys/net/ipv6/conf";
const char sys_net_path[] = "/sys/class/net";
@@ -55,8 +58,8 @@
errno = ENOENT;
return -1;
}
- std::string path(android::StringPrintf("%s/%s/%s", ipv6_proc_path, interface, setting));
- return android::WriteStringToFile(value, path);
+ std::string path(StringPrintf("%s/%s/%s", ipv6_proc_path, interface, setting));
+ return WriteStringToFile(value, path);
}
int InterfaceController::setEnableIPv6(const char *interface, const int on) {
@@ -133,7 +136,7 @@
// ID to get the table. If it's set to -1000, routes from interface ID 5 will go into
// table 1005, etc.
void InterfaceController::setAcceptRARouteTable(int tableOrOffset) {
- std::string value(android::StringPrintf("%d", tableOrOffset));
+ std::string value(StringPrintf("%d", tableOrOffset));
setOnAllInterfaces("accept_ra_rt_table", value.c_str());
}
@@ -143,8 +146,8 @@
errno = ENOENT;
return -1;
}
- std::string path(android::StringPrintf("%s/%s/mtu", sys_net_path, interface));
- return android::WriteStringToFile(mtu, path);
+ std::string path(StringPrintf("%s/%s/mtu", sys_net_path, interface));
+ return WriteStringToFile(mtu, path);
}
void InterfaceController::setIPv6OptimisticMode(const char *value) {
diff --git a/server/RouteController.cpp b/server/RouteController.cpp
index 98a965e..889779d 100644
--- a/server/RouteController.cpp
+++ b/server/RouteController.cpp
@@ -31,13 +31,15 @@
#include "UidRanges.h"
#include "DummyNetwork.h"
+#include "base/file.h"
#define LOG_TAG "Netd"
#include "log/log.h"
#include "logwrap/logwrap.h"
#include "netutils/ifc.h"
-#include "utils/file.h"
#include "resolv_netid.h"
+using android::base::WriteStringToFile;
+
namespace {
// BEGIN CONSTANTS --------------------------------------------------------------------------------
@@ -168,7 +170,7 @@
addTableName(entry.second, entry.first, &contents);
}
- if (!android::WriteStringToFile(contents, RT_TABLES_PATH, RT_TABLES_MODE, AID_SYSTEM, AID_WIFI)) {
+ if (!WriteStringToFile(contents, RT_TABLES_PATH, RT_TABLES_MODE, AID_SYSTEM, AID_WIFI)) {
ALOGE("failed to write to %s (%s)", RT_TABLES_PATH, strerror(errno));
return;
}
diff --git a/server/SoftapController.cpp b/server/SoftapController.cpp
index 2465529..d9e40a4 100644
--- a/server/SoftapController.cpp
+++ b/server/SoftapController.cpp
@@ -34,16 +34,19 @@
#include <openssl/sha.h>
#define LOG_TAG "SoftapController"
+#include <base/file.h>
+#include <base/stringprintf.h>
#include <cutils/log.h>
#include <netutils/ifc.h>
#include <private/android_filesystem_config.h>
-#include <utils/file.h>
-#include <utils/stringprintf.h>
#include "wifi.h"
#include "ResponseCode.h"
#include "SoftapController.h"
+using android::base::StringPrintf;
+using android::base::WriteStringToFile;
+
static const char HOSTAPD_CONF_FILE[] = "/data/misc/wifi/hostapd.conf";
static const char HOSTAPD_BIN_FILE[] = "/system/bin/hostapd";
@@ -136,7 +139,7 @@
channel = AP_CHANNEL_DEFAULT;
}
- std::string wbuf(android::StringPrintf("interface=%s\n"
+ std::string wbuf(StringPrintf("interface=%s\n"
"driver=nl80211\n"
"ctrl_interface=/data/misc/wifi/hostapd\n"
"ssid=%s\n"
@@ -152,10 +155,10 @@
char psk_str[2*SHA256_DIGEST_LENGTH+1];
if (!strcmp(argv[6], "wpa-psk")) {
generatePsk(argv[3], argv[7], psk_str);
- fbuf = android::StringPrintf("%swpa=3\nwpa_pairwise=TKIP CCMP\nwpa_psk=%s\n", wbuf.c_str(), psk_str);
+ fbuf = StringPrintf("%swpa=3\nwpa_pairwise=TKIP CCMP\nwpa_psk=%s\n", wbuf.c_str(), psk_str);
} else if (!strcmp(argv[6], "wpa2-psk")) {
generatePsk(argv[3], argv[7], psk_str);
- fbuf = android::StringPrintf("%swpa=2\nrsn_pairwise=CCMP\nwpa_psk=%s\n", wbuf.c_str(), psk_str);
+ fbuf = StringPrintf("%swpa=2\nrsn_pairwise=CCMP\nwpa_psk=%s\n", wbuf.c_str(), psk_str);
} else if (!strcmp(argv[6], "open")) {
fbuf = wbuf;
}
@@ -167,7 +170,7 @@
fbuf = wbuf;
}
- if (!android::WriteStringToFile(fbuf, HOSTAPD_CONF_FILE, 0660, AID_SYSTEM, AID_WIFI)) {
+ if (!WriteStringToFile(fbuf, HOSTAPD_CONF_FILE, 0660, AID_SYSTEM, AID_WIFI)) {
ALOGE("Cannot write to \"%s\": %s", HOSTAPD_CONF_FILE, strerror(errno));
return ResponseCode::OperationFailed;
}
diff --git a/server/TetherController.cpp b/server/TetherController.cpp
index 6bb9fde..88baa31 100644
--- a/server/TetherController.cpp
+++ b/server/TetherController.cpp
@@ -30,7 +30,6 @@
#define LOG_TAG "TetherController"
#include <cutils/log.h>
#include <cutils/properties.h>
-#include <utils/file.h>
#include "Fwmark.h"
#include "NetdConstants.h"