From 4b166f0e69d46858ff998414da2a01e0266fa339 Mon Sep 17 00:00:00 2001 From: Elliott Hughes Date: Fri, 4 Dec 2015 15:30:20 -0800 Subject: Track rename from base/ to android-base/. Change-Id: I354a8c424d340a9abe21fd716a4ee0d3b177d86f --- applypatch/applypatch.cpp | 2 +- recovery.cpp | 4 ++-- screen_ui.cpp | 4 ++-- uncrypt/uncrypt.cpp | 4 ++-- updater/blockimg.cpp | 4 ++-- updater/install.cpp | 6 +++--- wear_ui.cpp | 2 +- 7 files changed, 13 insertions(+), 13 deletions(-) diff --git a/applypatch/applypatch.cpp b/applypatch/applypatch.cpp index 1767761a8..f9425af93 100644 --- a/applypatch/applypatch.cpp +++ b/applypatch/applypatch.cpp @@ -25,7 +25,7 @@ #include #include -#include +#include #include "mincrypt/sha.h" #include "applypatch.h" diff --git a/recovery.cpp b/recovery.cpp index aaca3e0fb..dace52f98 100644 --- a/recovery.cpp +++ b/recovery.cpp @@ -34,8 +34,8 @@ #include #include -#include -#include +#include +#include #include #include diff --git a/screen_ui.cpp b/screen_ui.cpp index f2fda2fb5..23fc90154 100644 --- a/screen_ui.cpp +++ b/screen_ui.cpp @@ -30,8 +30,8 @@ #include -#include -#include +#include +#include #include #include "common.h" diff --git a/uncrypt/uncrypt.cpp b/uncrypt/uncrypt.cpp index 4956cc297..482504192 100644 --- a/uncrypt/uncrypt.cpp +++ b/uncrypt/uncrypt.cpp @@ -53,8 +53,8 @@ #include -#include -#include +#include +#include #include #include #include diff --git a/updater/blockimg.cpp b/updater/blockimg.cpp index dd6cf0d96..a9d8cc68c 100644 --- a/updater/blockimg.cpp +++ b/updater/blockimg.cpp @@ -37,8 +37,8 @@ #include #include -#include -#include +#include +#include #include "applypatch/applypatch.h" #include "edify/expr.h" diff --git a/updater/install.cpp b/updater/install.cpp index 97e390560..e2b3db7ce 100644 --- a/updater/install.cpp +++ b/updater/install.cpp @@ -34,9 +34,9 @@ #include #include -#include -#include -#include +#include +#include +#include #include "bootloader.h" #include "applypatch/applypatch.h" diff --git a/wear_ui.cpp b/wear_ui.cpp index 55b7afc8f..3ee38e8a4 100644 --- a/wear_ui.cpp +++ b/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; -- cgit v1.2.3