diff options
| -rw-r--r-- | applypatch/Android.mk | 13 | ||||
| -rw-r--r-- | applypatch/applypatch.cpp | 2 | ||||
| -rw-r--r-- | recovery.cpp | 4 | ||||
| -rw-r--r-- | screen_ui.cpp | 4 | ||||
| -rw-r--r-- | uncrypt/uncrypt.cpp | 4 | ||||
| -rw-r--r-- | updater/blockimg.cpp | 4 | ||||
| -rw-r--r-- | updater/install.cpp | 6 | ||||
| -rw-r--r-- | wear_ui.cpp | 2 |
8 files changed, 13 insertions, 26 deletions
diff --git a/applypatch/Android.mk b/applypatch/Android.mk index cc17a13ae..93a272997 100644 --- a/applypatch/Android.mk +++ b/applypatch/Android.mk @@ -39,19 +39,6 @@ include $(BUILD_EXECUTABLE) include $(CLEAR_VARS) LOCAL_CLANG := true -LOCAL_SRC_FILES := main.cpp -LOCAL_MODULE := applypatch_static -LOCAL_FORCE_STATIC_EXECUTABLE := true -LOCAL_MODULE_TAGS := eng -LOCAL_C_INCLUDES += bootable/recovery -LOCAL_STATIC_LIBRARIES += libapplypatch libbase libmtdutils libmincrypt libbz -LOCAL_STATIC_LIBRARIES += libz libcutils libc - -include $(BUILD_EXECUTABLE) - -include $(CLEAR_VARS) - -LOCAL_CLANG := true LOCAL_SRC_FILES := imgdiff.cpp utils.cpp bsdiff.cpp LOCAL_MODULE := imgdiff LOCAL_FORCE_STATIC_EXECUTABLE := true 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 <sys/types.h> #include <unistd.h> -#include <base/strings.h> +#include <android-base/strings.h> #include "mincrypt/sha.h" #include "applypatch.h" diff --git a/recovery.cpp b/recovery.cpp index 55334db32..3b388bc1d 100644 --- a/recovery.cpp +++ b/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> 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 <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" 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 <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> 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 <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" 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 <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" 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; |