diff options
-rw-r--r-- | adb.cpp | 8 | ||||
-rw-r--r-- | adb.h | 2 | ||||
-rw-r--r-- | adb_auth_host.cpp | 2 | ||||
-rw-r--r-- | adb_client.cpp | 4 | ||||
-rw-r--r-- | adb_io.cpp | 2 | ||||
-rw-r--r-- | adb_io_test.cpp | 4 | ||||
-rw-r--r-- | adb_listeners.cpp | 2 | ||||
-rw-r--r-- | adb_trace.cpp | 4 | ||||
-rw-r--r-- | adb_trace.h | 4 | ||||
-rw-r--r-- | adb_utils.cpp | 6 | ||||
-rw-r--r-- | adb_utils_test.cpp | 4 | ||||
-rw-r--r-- | client/main.cpp | 6 | ||||
-rw-r--r-- | commandline.cpp | 6 | ||||
-rw-r--r-- | console.cpp | 6 | ||||
-rw-r--r-- | daemon/main.cpp | 4 | ||||
-rw-r--r-- | fdevent.cpp | 4 | ||||
-rw-r--r-- | file_sync_client.cpp | 6 | ||||
-rw-r--r-- | file_sync_service.cpp | 4 | ||||
-rw-r--r-- | services.cpp | 6 | ||||
-rw-r--r-- | shell_service.cpp | 4 | ||||
-rw-r--r-- | shell_service.h | 2 | ||||
-rw-r--r-- | shell_service_test.cpp | 2 | ||||
-rw-r--r-- | sysdeps.h | 2 | ||||
-rw-r--r-- | sysdeps_win32.cpp | 8 | ||||
-rwxr-xr-x | sysdeps_win32_test.cpp | 2 | ||||
-rw-r--r-- | test_track_devices.cpp | 2 | ||||
-rw-r--r-- | transport.cpp | 6 | ||||
-rw-r--r-- | transport_local.cpp | 2 | ||||
-rw-r--r-- | usb_linux.cpp | 6 | ||||
-rw-r--r-- | usb_osx.cpp | 4 |
30 files changed, 62 insertions, 62 deletions
@@ -33,10 +33,10 @@ #include <string> #include <vector> -#include <base/logging.h> -#include <base/macros.h> -#include <base/stringprintf.h> -#include <base/strings.h> +#include <android-base/logging.h> +#include <android-base/macros.h> +#include <android-base/stringprintf.h> +#include <android-base/strings.h> #include "adb_auth.h" #include "adb_io.h" @@ -22,7 +22,7 @@ #include <string> -#include <base/macros.h> +#include <android-base/macros.h> #include "adb_trace.h" #include "fdevent.h" diff --git a/adb_auth_host.cpp b/adb_auth_host.cpp index e11bff0..facacef 100644 --- a/adb_auth_host.cpp +++ b/adb_auth_host.cpp @@ -43,7 +43,7 @@ #include "mincrypt/rsa.h" #undef RSA_verify -#include <base/strings.h> +#include <android-base/strings.h> #include <cutils/list.h> #include <openssl/evp.h> diff --git a/adb_client.cpp b/adb_client.cpp index ddeb5f1..cb5e488 100644 --- a/adb_client.cpp +++ b/adb_client.cpp @@ -31,8 +31,8 @@ #include <string> #include <vector> -#include <base/stringprintf.h> -#include <base/strings.h> +#include <android-base/stringprintf.h> +#include <android-base/strings.h> #include <cutils/sockets.h> #include "adb_io.h" @@ -20,7 +20,7 @@ #include <unistd.h> -#include <base/stringprintf.h> +#include <android-base/stringprintf.h> #include "adb_trace.h" #include "adb_utils.h" diff --git a/adb_io_test.cpp b/adb_io_test.cpp index 6928a90..21a82e8 100644 --- a/adb_io_test.cpp +++ b/adb_io_test.cpp @@ -27,8 +27,8 @@ #include <string> -#include "base/file.h" -#include "base/test_utils.h" +#include <android-base/file.h> +#include <android-base/test_utils.h> // All of these tests fail on Windows because they use the C Runtime open(), // but the adb_io APIs expect file descriptors from adb_open(). This could diff --git a/adb_listeners.cpp b/adb_listeners.cpp index 1b75090..d7b892c 100644 --- a/adb_listeners.cpp +++ b/adb_listeners.cpp @@ -19,7 +19,7 @@ #include <stdio.h> #include <stdlib.h> -#include <base/stringprintf.h> +#include <android-base/stringprintf.h> #include <cutils/sockets.h> #include "sysdeps.h" diff --git a/adb_trace.cpp b/adb_trace.cpp index cf99df7..62900c0 100644 --- a/adb_trace.cpp +++ b/adb_trace.cpp @@ -21,8 +21,8 @@ #include <unordered_map> #include <vector> -#include <base/logging.h> -#include <base/strings.h> +#include <android-base/logging.h> +#include <android-base/strings.h> #include "adb.h" diff --git a/adb_trace.h b/adb_trace.h index 78b2deb..d50f947 100644 --- a/adb_trace.h +++ b/adb_trace.h @@ -17,8 +17,8 @@ #ifndef __ADB_TRACE_H #define __ADB_TRACE_H -#include <base/logging.h> -#include <base/stringprintf.h> +#include <android-base/logging.h> +#include <android-base/stringprintf.h> /* IMPORTANT: if you change the following list, don't * forget to update the corresponding 'tags' table in diff --git a/adb_utils.cpp b/adb_utils.cpp index 42f1c7d..3ed2a7d 100644 --- a/adb_utils.cpp +++ b/adb_utils.cpp @@ -26,9 +26,9 @@ #include <algorithm> -#include <base/logging.h> -#include <base/stringprintf.h> -#include <base/strings.h> +#include <android-base/logging.h> +#include <android-base/stringprintf.h> +#include <android-base/strings.h> #include "adb_trace.h" #include "sysdeps.h" diff --git a/adb_utils_test.cpp b/adb_utils_test.cpp index 93c20cb..4508bca 100644 --- a/adb_utils_test.cpp +++ b/adb_utils_test.cpp @@ -30,8 +30,8 @@ #include "sysdeps.h" -#include <base/macros.h> -#include <base/test_utils.h> +#include <android-base/macros.h> +#include <android-base/test_utils.h> #ifdef _WIN32 static std::string subdir(const char* parent, const char* child) { diff --git a/client/main.cpp b/client/main.cpp index 04b9882..3ce5242 100644 --- a/client/main.cpp +++ b/client/main.cpp @@ -27,9 +27,9 @@ #include <sched.h> #endif -#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 "adb.h" #include "adb_auth.h" diff --git a/commandline.cpp b/commandline.cpp index bd3813e..d244f7d 100644 --- a/commandline.cpp +++ b/commandline.cpp @@ -35,9 +35,9 @@ #include <string> #include <vector> -#include <base/logging.h> -#include <base/stringprintf.h> -#include <base/strings.h> +#include <android-base/logging.h> +#include <android-base/stringprintf.h> +#include <android-base/strings.h> #if !defined(_WIN32) #include <signal.h> diff --git a/console.cpp b/console.cpp index 5a9c6ab..15c6abd 100644 --- a/console.cpp +++ b/console.cpp @@ -18,9 +18,9 @@ #include <stdio.h> -#include <base/file.h> -#include <base/logging.h> -#include <base/strings.h> +#include <android-base/file.h> +#include <android-base/logging.h> +#include <android-base/strings.h> #include <cutils/sockets.h> #include "adb.h" diff --git a/daemon/main.cpp b/daemon/main.cpp index f4e054e..10c5296 100644 --- a/daemon/main.cpp +++ b/daemon/main.cpp @@ -25,8 +25,8 @@ #include <getopt.h> #include <sys/prctl.h> -#include "base/logging.h" -#include "base/stringprintf.h" +#include <android-base/logging.h> +#include <android-base/stringprintf.h> #include "cutils/properties.h" #include "private/android_filesystem_config.h" #include "selinux/selinux.h" diff --git a/fdevent.cpp b/fdevent.cpp index 46547b9..25e8376 100644 --- a/fdevent.cpp +++ b/fdevent.cpp @@ -31,8 +31,8 @@ #include <unordered_map> #include <vector> -#include <base/logging.h> -#include <base/stringprintf.h> +#include <android-base/logging.h> +#include <android-base/stringprintf.h> #include "adb_io.h" #include "adb_trace.h" diff --git a/file_sync_client.cpp b/file_sync_client.cpp index 9ad7bad..463c1c0 100644 --- a/file_sync_client.cpp +++ b/file_sync_client.cpp @@ -41,9 +41,9 @@ #include "file_sync_service.h" #include "line_printer.h" -#include <base/file.h> -#include <base/strings.h> -#include <base/stringprintf.h> +#include <android-base/file.h> +#include <android-base/strings.h> +#include <android-base/stringprintf.h> struct syncsendbuf { unsigned id; diff --git a/file_sync_service.cpp b/file_sync_service.cpp index 945fa5a..781968b 100644 --- a/file_sync_service.cpp +++ b/file_sync_service.cpp @@ -35,8 +35,8 @@ #include "adb_utils.h" #include "private/android_filesystem_config.h" -#include <base/stringprintf.h> -#include <base/strings.h> +#include <android-base/stringprintf.h> +#include <android-base/strings.h> static bool should_use_fs_config(const std::string& path) { // TODO: use fs_config to configure permissions on /data. diff --git a/services.cpp b/services.cpp index 41da4b8..523353a 100644 --- a/services.cpp +++ b/services.cpp @@ -31,9 +31,9 @@ #include <unistd.h> #endif -#include <base/file.h> -#include <base/stringprintf.h> -#include <base/strings.h> +#include <android-base/file.h> +#include <android-base/stringprintf.h> +#include <android-base/strings.h> #include <cutils/sockets.h> #if !ADB_HOST diff --git a/shell_service.cpp b/shell_service.cpp index 2e41fe6..3fc70b0 100644 --- a/shell_service.cpp +++ b/shell_service.cpp @@ -89,8 +89,8 @@ #include <memory> -#include <base/logging.h> -#include <base/stringprintf.h> +#include <android-base/logging.h> +#include <android-base/stringprintf.h> #include <paths.h> #include "adb.h" diff --git a/shell_service.h b/shell_service.h index 6f8ea9b..e3d676a 100644 --- a/shell_service.h +++ b/shell_service.h @@ -27,7 +27,7 @@ #include <stdint.h> -#include <base/macros.h> +#include <android-base/macros.h> #include "adb.h" diff --git a/shell_service_test.cpp b/shell_service_test.cpp index a012f3e..c85232b 100644 --- a/shell_service_test.cpp +++ b/shell_service_test.cpp @@ -23,7 +23,7 @@ #include <string> #include <vector> -#include <base/strings.h> +#include <android-base/strings.h> #include "adb.h" #include "adb_io.h" @@ -29,7 +29,7 @@ #include <string> // Include this before open/unlink are defined as macros below. -#include <base/utf8.h> +#include <android-base/utf8.h> /* * TEMP_FAILURE_RETRY is defined by some, but not all, versions of diff --git a/sysdeps_win32.cpp b/sysdeps_win32.cpp index 81dcb41..0a2a8f6 100644 --- a/sysdeps_win32.cpp +++ b/sysdeps_win32.cpp @@ -32,10 +32,10 @@ #include <cutils/sockets.h> -#include <base/logging.h> -#include <base/stringprintf.h> -#include <base/strings.h> -#include <base/utf8.h> +#include <android-base/logging.h> +#include <android-base/stringprintf.h> +#include <android-base/strings.h> +#include <android-base/utf8.h> #include "adb.h" diff --git a/sysdeps_win32_test.cpp b/sysdeps_win32_test.cpp index 55b5eb4..81923cb 100755 --- a/sysdeps_win32_test.cpp +++ b/sysdeps_win32_test.cpp @@ -18,7 +18,7 @@ #include "sysdeps.h" -#include "base/test_utils.h" +#include <android-base/test_utils.h> TEST(sysdeps_win32, adb_getenv) { // Insert all test env vars before first call to adb_getenv() which will diff --git a/test_track_devices.cpp b/test_track_devices.cpp index 6f658f6..b10f8ee 100644 --- a/test_track_devices.cpp +++ b/test_track_devices.cpp @@ -9,7 +9,7 @@ #include <sys/socket.h> #include <unistd.h> -#include <base/file.h> +#include <android-base/file.h> static void panic( const char* msg ) diff --git a/transport.cpp b/transport.cpp index 2f18f20..d20eaff 100644 --- a/transport.cpp +++ b/transport.cpp @@ -29,9 +29,9 @@ #include <algorithm> #include <list> -#include <base/logging.h> -#include <base/stringprintf.h> -#include <base/strings.h> +#include <android-base/logging.h> +#include <android-base/stringprintf.h> +#include <android-base/strings.h> #include "adb.h" #include "adb_utils.h" diff --git a/transport_local.cpp b/transport_local.cpp index bf0cc3c..2c1a71d 100644 --- a/transport_local.cpp +++ b/transport_local.cpp @@ -25,7 +25,7 @@ #include <string.h> #include <sys/types.h> -#include <base/stringprintf.h> +#include <android-base/stringprintf.h> #include <cutils/sockets.h> #if !ADB_HOST diff --git a/usb_linux.cpp b/usb_linux.cpp index 0358b62..ed5d2d6 100644 --- a/usb_linux.cpp +++ b/usb_linux.cpp @@ -39,9 +39,9 @@ #include <mutex> #include <string> -#include <base/file.h> -#include <base/stringprintf.h> -#include <base/strings.h> +#include <android-base/file.h> +#include <android-base/stringprintf.h> +#include <android-base/strings.h> #include "adb.h" #include "transport.h" diff --git a/usb_osx.cpp b/usb_osx.cpp index e0dcc75..148be1d 100644 --- a/usb_osx.cpp +++ b/usb_osx.cpp @@ -29,8 +29,8 @@ #include <inttypes.h> #include <stdio.h> -#include <base/logging.h> -#include <base/stringprintf.h> +#include <android-base/logging.h> +#include <android-base/stringprintf.h> #include "adb.h" #include "transport.h" |