summaryrefslogtreecommitdiffstats
path: root/tests/unit
diff options
context:
space:
mode:
authorMark Salyzyn <salyzyn@google.com>2018-11-15 17:09:56 +0100
committerandroid-build-merger <android-build-merger@google.com>2018-11-15 17:09:56 +0100
commit838cac47987a34d6b3a0f809075221c5c657a355 (patch)
tree6a9288988dd4c64d5487b541320ccf0bf4b58a3e /tests/unit
parentMerge "minadbd: track adb C++ version change." (diff)
parentMerge "switch to using android-base/file.h instead of android-base/test_utils.h" (diff)
downloadandroid_bootable_recovery-838cac47987a34d6b3a0f809075221c5c657a355.tar
android_bootable_recovery-838cac47987a34d6b3a0f809075221c5c657a355.tar.gz
android_bootable_recovery-838cac47987a34d6b3a0f809075221c5c657a355.tar.bz2
android_bootable_recovery-838cac47987a34d6b3a0f809075221c5c657a355.tar.lz
android_bootable_recovery-838cac47987a34d6b3a0f809075221c5c657a355.tar.xz
android_bootable_recovery-838cac47987a34d6b3a0f809075221c5c657a355.tar.zst
android_bootable_recovery-838cac47987a34d6b3a0f809075221c5c657a355.zip
Diffstat (limited to 'tests/unit')
-rw-r--r--tests/unit/applypatch_test.cpp1
-rw-r--r--tests/unit/dirutil_test.cpp2
-rw-r--r--tests/unit/parse_install_logs_test.cpp1
-rw-r--r--tests/unit/screen_ui_test.cpp2
-rw-r--r--tests/unit/sysutil_test.cpp1
-rw-r--r--tests/unit/zip_test.cpp1
6 files changed, 2 insertions, 6 deletions
diff --git a/tests/unit/applypatch_test.cpp b/tests/unit/applypatch_test.cpp
index 066f981b4..794f2c103 100644
--- a/tests/unit/applypatch_test.cpp
+++ b/tests/unit/applypatch_test.cpp
@@ -32,7 +32,6 @@
#include <android-base/file.h>
#include <android-base/logging.h>
#include <android-base/stringprintf.h>
-#include <android-base/test_utils.h>
#include <android-base/unique_fd.h>
#include <gtest/gtest.h>
diff --git a/tests/unit/dirutil_test.cpp b/tests/unit/dirutil_test.cpp
index 1ca786c28..4dd111a70 100644
--- a/tests/unit/dirutil_test.cpp
+++ b/tests/unit/dirutil_test.cpp
@@ -20,7 +20,7 @@
#include <string>
-#include <android-base/test_utils.h>
+#include <android-base/file.h>
#include <gtest/gtest.h>
#include "otautil/dirutil.h"
diff --git a/tests/unit/parse_install_logs_test.cpp b/tests/unit/parse_install_logs_test.cpp
index 8061f3be1..72169a0c6 100644
--- a/tests/unit/parse_install_logs_test.cpp
+++ b/tests/unit/parse_install_logs_test.cpp
@@ -20,7 +20,6 @@
#include <android-base/file.h>
#include <android-base/strings.h>
-#include <android-base/test_utils.h>
#include <gtest/gtest.h>
#include "otautil/parse_install_logs.h"
diff --git a/tests/unit/screen_ui_test.cpp b/tests/unit/screen_ui_test.cpp
index b780af430..09c49977f 100644
--- a/tests/unit/screen_ui_test.cpp
+++ b/tests/unit/screen_ui_test.cpp
@@ -23,9 +23,9 @@
#include <string>
#include <vector>
+#include <android-base/file.h>
#include <android-base/logging.h>
#include <android-base/stringprintf.h>
-#include <android-base/test_utils.h>
#include <gtest/gtest.h>
#include <gtest/gtest_prod.h>
diff --git a/tests/unit/sysutil_test.cpp b/tests/unit/sysutil_test.cpp
index de8ff7065..77625dbe9 100644
--- a/tests/unit/sysutil_test.cpp
+++ b/tests/unit/sysutil_test.cpp
@@ -17,7 +17,6 @@
#include <string>
#include <android-base/file.h>
-#include <android-base/test_utils.h>
#include <gtest/gtest.h>
#include "otautil/sysutil.h"
diff --git a/tests/unit/zip_test.cpp b/tests/unit/zip_test.cpp
index 47f33d9ea..dfe617ebe 100644
--- a/tests/unit/zip_test.cpp
+++ b/tests/unit/zip_test.cpp
@@ -21,7 +21,6 @@
#include <vector>
#include <android-base/file.h>
-#include <android-base/test_utils.h>
#include <gtest/gtest.h>
#include <ziparchive/zip_archive.h>