Merge "Track rename from base/ to android-base/."

am: 20a8fa98f6

* commit '20a8fa98f6b858999b623272a182843259e1044c':
  Track rename from base/ to android-base/.

Benchmark.cpp

@@ -19,8 +19,8 @@
 #include "VolumeManager.h"
 #include "ResponseCode.h"
 
-#include <base/file.h>
-#include <base/logging.h>
+#include <android-base/file.h>
+#include <android-base/logging.h>
 #include <cutils/iosched_policy.h>
 #include <private/android_filesystem_config.h>
 

BenchmarkGen.h

@@ -20,7 +20,7 @@
  ******************************************************************/
 
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 #include <stdlib.h>
 #include <sys/types.h>

CommandListener.cpp

@@ -30,7 +30,7 @@
 
 #define LOG_TAG "VoldCmdListener"
 
-#include <base/stringprintf.h>
+#include <android-base/stringprintf.h>
 #include <cutils/fs.h>
 #include <cutils/log.h>
 

CryptCommandListener.cpp

@@ -30,7 +30,7 @@
 
 #define LOG_TAG "VoldCryptCmdListener"
 
-#include <base/stringprintf.h>
+#include <android-base/stringprintf.h>
 #include <cutils/fs.h>
 #include <cutils/log.h>
 #include <cutils/sockets.h>

Disk.cpp

@@ -22,9 +22,9 @@
 #include "VolumeManager.h"
 #include "ResponseCode.h"
 
-#include <base/file.h>
-#include <base/stringprintf.h>
-#include <base/logging.h>
+#include <android-base/file.h>
+#include <android-base/stringprintf.h>
+#include <android-base/logging.h>
 #include <diskconfig/diskconfig.h>
 
 #include <vector>

EmulatedVolume.cpp

@@ -17,8 +17,8 @@
 #include "EmulatedVolume.h"
 #include "Utils.h"
 
-#include <base/stringprintf.h>
-#include <base/logging.h>
+#include <android-base/stringprintf.h>
+#include <android-base/logging.h>
 #include <cutils/fs.h>
 #include <private/android_filesystem_config.h>
 

Ext4Crypt.cpp

@@ -25,8 +25,8 @@
 #define LOG_TAG "Ext4Crypt"
 #include "cutils/log.h"
 #include <cutils/klog.h>
-#include <base/file.h>
-#include <base/stringprintf.h>
+#include <android-base/file.h>
+#include <android-base/stringprintf.h>
 
 namespace {
     // Key length in bits

MoveTask.cpp

@@ -19,8 +19,8 @@
 #include "VolumeManager.h"
 #include "ResponseCode.h"
 
-#include <base/stringprintf.h>
-#include <base/logging.h>
+#include <android-base/stringprintf.h>
+#include <android-base/logging.h>
 #include <private/android_filesystem_config.h>
 #include <hardware_legacy/power.h>
 

PrivateVolume.cpp

@@ -23,8 +23,8 @@
 #include "ResponseCode.h"
 #include "cryptfs.h"
 
-#include <base/stringprintf.h>
-#include <base/logging.h>
+#include <android-base/stringprintf.h>
+#include <android-base/logging.h>
 #include <cutils/fs.h>
 #include <private/android_filesystem_config.h>
 

PublicVolume.cpp

@@ -20,8 +20,8 @@
 #include "VolumeManager.h"
 #include "ResponseCode.h"
 
-#include <base/stringprintf.h>
-#include <base/logging.h>
+#include <android-base/stringprintf.h>
+#include <android-base/logging.h>
 #include <cutils/fs.h>
 #include <private/android_filesystem_config.h>
 

TrimTask.cpp

@@ -20,8 +20,8 @@
 #include "VolumeManager.h"
 #include "ResponseCode.h"
 
-#include <base/stringprintf.h>
-#include <base/logging.h>
+#include <android-base/stringprintf.h>
+#include <android-base/logging.h>
 #include <cutils/properties.h>
 #include <fs_mgr.h>
 #include <private/android_filesystem_config.h>

Utils.cpp

@@ -18,9 +18,9 @@
 #include "Utils.h"
 #include "Process.h"
 
-#include <base/file.h>
-#include <base/logging.h>
-#include <base/stringprintf.h>
+#include <android-base/file.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
 #include <cutils/fs.h>
 #include <cutils/properties.h>
 #include <private/android_filesystem_config.h>

VolumeBase.cpp

@@ -19,8 +19,8 @@
 #include "VolumeManager.h"
 #include "ResponseCode.h"
 
-#include <base/stringprintf.h>
-#include <base/logging.h>
+#include <android-base/stringprintf.h>
+#include <android-base/logging.h>
 
 #include <fcntl.h>
 #include <stdlib.h>

VolumeManager.cpp

@@ -35,8 +35,8 @@
 
 #include <openssl/md5.h>
 
-#include <base/logging.h>
-#include <base/stringprintf.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
 #include <cutils/fs.h>
 #include <cutils/log.h>
 

bench/benchgen.py

@@ -148,7 +148,7 @@ with open("BenchmarkGen.h", 'w') as bench:
  ******************************************************************/
 
 
-#include <base/logging.h>
+#include <android-base/logging.h>
 
 #include <stdlib.h>
 #include <sys/types.h>

fs/Ext4.cpp

@@ -37,8 +37,8 @@
 
 #define LOG_TAG "Vold"
 
-#include <base/logging.h>
-#include <base/stringprintf.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
 #include <cutils/log.h>
 #include <cutils/properties.h>
 #include <logwrap/logwrap.h>

fs/F2fs.cpp

@@ -17,8 +17,8 @@
 #include "F2fs.h"
 #include "Utils.h"
 
-#include <base/logging.h>
-#include <base/stringprintf.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
 
 #include <vector>
 #include <string>

fs/Vfat.cpp

@@ -37,8 +37,8 @@
 
 #define LOG_TAG "Vold"
 
-#include <base/logging.h>
-#include <base/stringprintf.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
 #include <cutils/log.h>
 #include <cutils/properties.h>
 #include <selinux/selinux.h>

main.cpp

@@ -22,8 +22,8 @@
 #include "cryptfs.h"
 #include "sehandle.h"
 
-#include <base/logging.h>
-#include <base/stringprintf.h>
+#include <android-base/logging.h>
+#include <android-base/stringprintf.h>
 #include <cutils/klog.h>
 #include <cutils/properties.h>
 #include <cutils/sockets.h>