Merge "Track rename from base/ to android-base/." am: 06ca938ce2

am: ff4c2c07e8

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

applypatch/applypatch.cpp

@@ -25,7 +25,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
-#include <base/strings.h>
+#include <android-base/strings.h>
 
 #include "mincrypt/sha.h"
 #include "applypatch.h"

recovery.cpp

@@ -34,8 +34,8 @@
 #include <chrono>
 
 #include <adb.h>
-#include <base/file.h>
-#include <base/stringprintf.h>
+#include <android-base/file.h>
+#include <android-base/stringprintf.h>
 #include <cutils/android_reboot.h>
 #include <cutils/properties.h>
 

screen_ui.cpp

@@ -30,8 +30,8 @@
 
 #include <vector>
 
-#include <base/strings.h>
-#include <base/stringprintf.h>
+#include <android-base/strings.h>
+#include <android-base/stringprintf.h>
 #include <cutils/properties.h>
 
 #include "common.h"

uncrypt/uncrypt.cpp

@@ -53,8 +53,8 @@
 
 #include <memory>
 
-#include <base/file.h>
-#include <base/strings.h>
+#include <android-base/file.h>
+#include <android-base/strings.h>
 #include <cutils/android_reboot.h>
 #include <cutils/properties.h>
 #include <fs_mgr.h>

updater/blockimg.cpp

@@ -37,8 +37,8 @@
 #include <string>
 #include <vector>
 
-#include <base/parseint.h>
-#include <base/strings.h>
+#include <android-base/parseint.h>
+#include <android-base/strings.h>
 
 #include "applypatch/applypatch.h"
 #include "edify/expr.h"

updater/install.cpp

@@ -34,9 +34,9 @@
 #include <linux/xattr.h>
 #include <inttypes.h>
 
-#include <base/parseint.h>
-#include <base/strings.h>
-#include <base/stringprintf.h>
+#include <android-base/parseint.h>
+#include <android-base/strings.h>
+#include <android-base/stringprintf.h>
 
 #include "bootloader.h"
 #include "applypatch/applypatch.h"

wear_ui.cpp

@@ -35,7 +35,7 @@
 #include "wear_ui.h"
 #include "ui.h"
 #include "cutils/properties.h"
-#include "base/strings.h"
+#include "android-base/strings.h"
 
 static int char_width;
 static int char_height;