Update for libbase.

Change-Id: I23b1281a63031a7481ea7b33c9ddbdbe7d3d6174

Android.mk

@@ -47,7 +47,8 @@ common_shared_libraries := \
 	libselinux \
 	libutils \
 	libhardware \
-	libsoftkeymaster
+	libsoftkeymaster \
+	libbase \
 
 common_static_libraries := \
 	libfs_mgr \

Disk.cpp

@@ -21,10 +21,10 @@
 #include "Utils.h"
 #include "VolumeBase.h"
 
+#include <base/file.h>
+#include <base/stringprintf.h>
 #include <cutils/log.h>
 #include <diskconfig/diskconfig.h>
-#include <utils/file.h>
-#include <utils/stringprintf.h>
 
 #include <fcntl.h>
 #include <stdio.h>
@@ -33,6 +33,9 @@
 #include <sys/stat.h>
 #include <sys/mount.h>
 
+using android::base::ReadFileToString;
+using android::base::StringPrintf;
+
 namespace android {
 namespace vold {
 

EmulatedVolume.cpp

@@ -19,10 +19,9 @@
 #include "EmulatedVolume.h"
 #include "Utils.h"
 
+#include <base/stringprintf.h>
 #include <cutils/fs.h>
 #include <cutils/log.h>
-#include <utils/file.h>
-#include <utils/stringprintf.h>
 #include <private/android_filesystem_config.h>
 
 #include <fcntl.h>
@@ -32,6 +31,8 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
+using android::base::StringPrintf;
+
 namespace android {
 namespace vold {
 

PublicVolume.cpp

@@ -20,10 +20,9 @@
 #include "PublicVolume.h"
 #include "Utils.h"
 
+#include <base/stringprintf.h>
 #include <cutils/fs.h>
 #include <cutils/log.h>
-#include <utils/file.h>
-#include <utils/stringprintf.h>
 #include <private/android_filesystem_config.h>
 
 #include <fcntl.h>
@@ -33,6 +32,8 @@
 #include <sys/types.h>
 #include <sys/wait.h>
 
+using android::base::StringPrintf;
+
 namespace android {
 namespace vold {
 

Utils.cpp

@@ -22,8 +22,6 @@
 
 #include <cutils/fs.h>
 #include <cutils/log.h>
-#include <utils/file.h>
-#include <utils/stringprintf.h>
 #include <private/android_filesystem_config.h>
 
 #include <fcntl.h>