diff options
28 files changed, 11 insertions, 30 deletions
diff --git a/adb/adb_io_test.cpp b/adb/adb_io_test.cpp index 611b23937..91b73a9a4 100644 --- a/adb/adb_io_test.cpp +++ b/adb/adb_io_test.cpp @@ -28,7 +28,6 @@ #include <string> #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/adb_utils_test.cpp b/adb/adb_utils_test.cpp index 341323fa9..870f6f048 100644 --- a/adb/adb_utils_test.cpp +++ b/adb/adb_utils_test.cpp @@ -30,8 +30,8 @@ #include "sysdeps.h" +#include <android-base/file.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/adb/client/adb_install.cpp b/adb/client/adb_install.cpp index 0008f7205..7f37c454b 100644 --- a/adb/client/adb_install.cpp +++ b/adb/client/adb_install.cpp @@ -30,7 +30,6 @@ #include "android-base/file.h" #include "android-base/stringprintf.h" #include "android-base/strings.h" -#include "android-base/test_utils.h" #include "client/file_sync_client.h" #include "commandline.h" #include "fastdeploy.h" diff --git a/adb/sysdeps/stat_test.cpp b/adb/sysdeps/stat_test.cpp index 2c2e0eeeb..67155d992 100644 --- a/adb/sysdeps/stat_test.cpp +++ b/adb/sysdeps/stat_test.cpp @@ -16,7 +16,7 @@ #include <string> -#include <android-base/test_utils.h> +#include <android-base/file.h> #include <gtest/gtest.h> #include "adb_utils.h" diff --git a/adb/sysdeps_win32_test.cpp b/adb/sysdeps_win32_test.cpp index 529b21215..183cd5b59 100644 --- a/adb/sysdeps_win32_test.cpp +++ b/adb/sysdeps_win32_test.cpp @@ -18,7 +18,7 @@ #include "sysdeps.h" -#include <android-base/test_utils.h> +#include <android-base/file.h> TEST(sysdeps_win32, adb_getenv) { // Insert all test env vars before first call to adb_getenv() which will diff --git a/base/file_test.cpp b/base/file_test.cpp index 67946523c..f64e81c0d 100644 --- a/base/file_test.cpp +++ b/base/file_test.cpp @@ -24,8 +24,6 @@ #include <string> -#include "android-base/test_utils.h" - #if !defined(_WIN32) #include <pwd.h> #endif diff --git a/base/mapped_file_test.cpp b/base/mapped_file_test.cpp index 57fde6f45..7e89723c6 100644 --- a/base/mapped_file_test.cpp +++ b/base/mapped_file_test.cpp @@ -25,7 +25,6 @@ #include <string> #include "android-base/file.h" -#include "android-base/test_utils.h" #include "android-base/unique_fd.h" TEST(mapped_file, smoke) { diff --git a/base/utf8_test.cpp b/base/utf8_test.cpp index fcb25c350..472e82c63 100644 --- a/base/utf8_test.cpp +++ b/base/utf8_test.cpp @@ -21,8 +21,8 @@ #include <fcntl.h> #include <stdlib.h> +#include "android-base/file.h" #include "android-base/macros.h" -#include "android-base/test_utils.h" #include "android-base/unique_fd.h" namespace android { diff --git a/bootstat/boot_event_record_store_test.cpp b/bootstat/boot_event_record_store_test.cpp index 4b7ab36ee..5ca9b0986 100644 --- a/bootstat/boot_event_record_store_test.cpp +++ b/bootstat/boot_event_record_store_test.cpp @@ -29,7 +29,6 @@ #include <android-base/chrono_utils.h> #include <android-base/file.h> #include <android-base/logging.h> -#include <android-base/test_utils.h> #include <android-base/unique_fd.h> #include <gmock/gmock.h> #include <gtest/gtest.h> diff --git a/debuggerd/libdebuggerd/test/open_files_list_test.cpp b/debuggerd/libdebuggerd/test/open_files_list_test.cpp index d7036fd39..3e920eb37 100644 --- a/debuggerd/libdebuggerd/test/open_files_list_test.cpp +++ b/debuggerd/libdebuggerd/test/open_files_list_test.cpp @@ -20,10 +20,9 @@ #include <string> +#include <android-base/file.h> #include <gtest/gtest.h> -#include "android-base/test_utils.h" - #include "libdebuggerd/open_files_list.h" // Check that we can produce a list of open files for the current process, and diff --git a/fastboot/fastboot.cpp b/fastboot/fastboot.cpp index 625e047b6..3e090d7a5 100644 --- a/fastboot/fastboot.cpp +++ b/fastboot/fastboot.cpp @@ -56,7 +56,6 @@ #include <android-base/parsenetaddress.h> #include <android-base/stringprintf.h> #include <android-base/strings.h> -#include <android-base/test_utils.h> #include <android-base/unique_fd.h> #include <build/version.h> #include <platform_tools_version.h> diff --git a/init/devices_test.cpp b/init/devices_test.cpp index d658f4d9a..3e7c1a840 100644 --- a/init/devices_test.cpp +++ b/init/devices_test.cpp @@ -16,8 +16,8 @@ #include "devices.h" +#include <android-base/file.h> #include <android-base/scopeguard.h> -#include <android-base/test_utils.h> #include <gtest/gtest.h> #include "util.h" diff --git a/init/init_test.cpp b/init/init_test.cpp index 0f9635f81..c2f0c41e3 100644 --- a/init/init_test.cpp +++ b/init/init_test.cpp @@ -17,7 +17,6 @@ #include <functional> #include <android-base/file.h> -#include <android-base/test_utils.h> #include <gtest/gtest.h> #include "action.h" diff --git a/init/persistent_properties_test.cpp b/init/persistent_properties_test.cpp index 872e9a1ff..13796a652 100644 --- a/init/persistent_properties_test.cpp +++ b/init/persistent_properties_test.cpp @@ -20,7 +20,7 @@ #include <vector> -#include <android-base/test_utils.h> +#include <android-base/file.h> #include <gtest/gtest.h> #include "util.h" diff --git a/init/ueventd_parser_test.cpp b/init/ueventd_parser_test.cpp index 31208b926..c3af341c6 100644 --- a/init/ueventd_parser_test.cpp +++ b/init/ueventd_parser_test.cpp @@ -16,7 +16,7 @@ #include "ueventd_parser.h" -#include <android-base/test_utils.h> +#include <android-base/file.h> #include <gtest/gtest.h> #include <private/android_filesystem_config.h> diff --git a/init/ueventd_test.cpp b/init/ueventd_test.cpp index 729005149..bfdc28e6d 100644 --- a/init/ueventd_test.cpp +++ b/init/ueventd_test.cpp @@ -27,7 +27,6 @@ #include <android-base/file.h> #include <android-base/scopeguard.h> -#include <android-base/test_utils.h> #include <gtest/gtest.h> #include <selinux/android.h> #include <selinux/label.h> diff --git a/init/util_test.cpp b/init/util_test.cpp index 3ae53a481..1b5afba27 100644 --- a/init/util_test.cpp +++ b/init/util_test.cpp @@ -20,8 +20,8 @@ #include <fcntl.h> #include <sys/stat.h> +#include <android-base/file.h> #include <android-base/stringprintf.h> -#include <android-base/test_utils.h> #include <gtest/gtest.h> using namespace std::literals::string_literals; diff --git a/libcutils/tests/android_get_control_file_test.cpp b/libcutils/tests/android_get_control_file_test.cpp index 6c6fd2ad2..8de85307d 100644 --- a/libcutils/tests/android_get_control_file_test.cpp +++ b/libcutils/tests/android_get_control_file_test.cpp @@ -23,8 +23,8 @@ #include <string> +#include <android-base/file.h> #include <android-base/stringprintf.h> -#include <android-base/test_utils.h> #include <cutils/android_get_control_file.h> #include <gtest/gtest.h> diff --git a/libcutils/tests/trace-dev_test.cpp b/libcutils/tests/trace-dev_test.cpp index f8d4f0064..832b36a0c 100644 --- a/libcutils/tests/trace-dev_test.cpp +++ b/libcutils/tests/trace-dev_test.cpp @@ -22,7 +22,6 @@ #include <android-base/file.h> #include <android-base/stringprintf.h> -#include <android-base/test_utils.h> #include <gtest/gtest.h> #include "../trace-dev.cpp" diff --git a/libmeminfo/libmeminfo_benchmark.cpp b/libmeminfo/libmeminfo_benchmark.cpp index 3820776b9..e2239f049 100644 --- a/libmeminfo/libmeminfo_benchmark.cpp +++ b/libmeminfo/libmeminfo_benchmark.cpp @@ -24,7 +24,6 @@ #include <android-base/file.h> #include <android-base/logging.h> -#include <android-base/test_utils.h> #include <benchmark/benchmark.h> diff --git a/libmeminfo/libmeminfo_test.cpp b/libmeminfo/libmeminfo_test.cpp index 22f358545..7a2be4172 100644 --- a/libmeminfo/libmeminfo_test.cpp +++ b/libmeminfo/libmeminfo_test.cpp @@ -30,7 +30,6 @@ #include <android-base/file.h> #include <android-base/logging.h> -#include <android-base/test_utils.h> using namespace std; using namespace android::meminfo; diff --git a/libunwindstack/tests/DexFileTest.cpp b/libunwindstack/tests/DexFileTest.cpp index 40f9f8ea9..95d217631 100644 --- a/libunwindstack/tests/DexFileTest.cpp +++ b/libunwindstack/tests/DexFileTest.cpp @@ -20,7 +20,7 @@ #include <unordered_map> -#include <android-base/test_utils.h> +#include <android-base/file.h> #include <unwindstack/MapInfo.h> #include <unwindstack/Memory.h> diff --git a/libunwindstack/tests/ElfCacheTest.cpp b/libunwindstack/tests/ElfCacheTest.cpp index d9acdec70..07fd6f642 100644 --- a/libunwindstack/tests/ElfCacheTest.cpp +++ b/libunwindstack/tests/ElfCacheTest.cpp @@ -18,7 +18,6 @@ #include <unistd.h> #include <android-base/file.h> -#include <android-base/test_utils.h> #include <gtest/gtest.h> diff --git a/libunwindstack/tests/MapInfoCreateMemoryTest.cpp b/libunwindstack/tests/MapInfoCreateMemoryTest.cpp index 2a73c7efb..0987bc126 100644 --- a/libunwindstack/tests/MapInfoCreateMemoryTest.cpp +++ b/libunwindstack/tests/MapInfoCreateMemoryTest.cpp @@ -27,7 +27,6 @@ #include <vector> #include <android-base/file.h> -#include <android-base/test_utils.h> #include <gtest/gtest.h> #include <unwindstack/Elf.h> diff --git a/libunwindstack/tests/MapInfoGetElfTest.cpp b/libunwindstack/tests/MapInfoGetElfTest.cpp index 4d7469690..f3b467955 100644 --- a/libunwindstack/tests/MapInfoGetElfTest.cpp +++ b/libunwindstack/tests/MapInfoGetElfTest.cpp @@ -29,7 +29,6 @@ #include <vector> #include <android-base/file.h> -#include <android-base/test_utils.h> #include <gtest/gtest.h> #include <unwindstack/Elf.h> diff --git a/libunwindstack/tests/MapsTest.cpp b/libunwindstack/tests/MapsTest.cpp index 6bdd0b260..80e292a63 100644 --- a/libunwindstack/tests/MapsTest.cpp +++ b/libunwindstack/tests/MapsTest.cpp @@ -19,7 +19,6 @@ #include <android-base/file.h> #include <android-base/stringprintf.h> -#include <android-base/test_utils.h> #include <gtest/gtest.h> #include <unwindstack/Maps.h> diff --git a/libunwindstack/tests/MemoryOfflineTest.cpp b/libunwindstack/tests/MemoryOfflineTest.cpp index 14d58e682..ab9aa9dc9 100644 --- a/libunwindstack/tests/MemoryOfflineTest.cpp +++ b/libunwindstack/tests/MemoryOfflineTest.cpp @@ -19,7 +19,6 @@ #include <gtest/gtest.h> #include <android-base/file.h> -#include <android-base/test_utils.h> #include <unwindstack/Memory.h> namespace unwindstack { diff --git a/libziparchive/zip_archive_test.cc b/libziparchive/zip_archive_test.cc index 0ea7d5d00..500a531c0 100644 --- a/libziparchive/zip_archive_test.cc +++ b/libziparchive/zip_archive_test.cc @@ -28,7 +28,6 @@ #include <android-base/file.h> #include <android-base/mapped_file.h> -#include <android-base/test_utils.h> #include <android-base/unique_fd.h> #include <gtest/gtest.h> #include <ziparchive/zip_archive.h> |