diff options
| author | 2018-11-19 20:25:30 +0000 | |
|---|---|---|
| committer | 2018-11-19 20:25:30 +0000 | |
| commit | 701001688f7f59900bbb6be529ee8299f9bc607f (patch) | |
| tree | 5f5ce344ff87539069dae1772a6d86332739bd6c | |
| parent | 1feeeba4338b3c19e9e08b16777aac0b921ae47d (diff) | |
| parent | d100107806bc02f8f9866790e0df8975d4764d4a (diff) | |
Merge changes I664fb325,I5e289469
* changes:
switch to using android-base/file.h instead of android-base/test_utils.h
Remove unused reference to android-base/test_utils.h
| -rw-r--r-- | cmds/incident_helper/tests/ih_util_test.cpp | 1 | ||||
| -rw-r--r-- | cmds/incidentd/tests/FdBuffer_test.cpp | 6 | ||||
| -rw-r--r-- | cmds/incidentd/tests/Reporter_test.cpp | 8 | ||||
| -rw-r--r-- | cmds/incidentd/tests/Throttler_test.cpp | 1 | ||||
| -rw-r--r-- | tools/aapt2/io/FileStream_test.cpp | 1 |
5 files changed, 7 insertions, 10 deletions
diff --git a/cmds/incident_helper/tests/ih_util_test.cpp b/cmds/incident_helper/tests/ih_util_test.cpp index efe714d98b18..670881a96cab 100644 --- a/cmds/incident_helper/tests/ih_util_test.cpp +++ b/cmds/incident_helper/tests/ih_util_test.cpp @@ -17,7 +17,6 @@ #include "ih_util.h" #include <android-base/file.h> -#include <android-base/test_utils.h> #include <gmock/gmock.h> #include <gtest/gtest.h> #include <string> diff --git a/cmds/incidentd/tests/FdBuffer_test.cpp b/cmds/incidentd/tests/FdBuffer_test.cpp index 9d208dffdca6..3f92c2a18328 100644 --- a/cmds/incidentd/tests/FdBuffer_test.cpp +++ b/cmds/incidentd/tests/FdBuffer_test.cpp @@ -17,13 +17,13 @@ #include "FdBuffer.h" #include "incidentd_util.h" -#include <android-base/file.h> -#include <android-base/test_utils.h> #include <fcntl.h> -#include <gtest/gtest.h> #include <signal.h> #include <string.h> +#include <android-base/file.h> +#include <gtest/gtest.h> + using namespace android; using namespace android::base; using namespace android::os::incidentd; diff --git a/cmds/incidentd/tests/Reporter_test.cpp b/cmds/incidentd/tests/Reporter_test.cpp index cf107c858cca..b863d150c9cd 100644 --- a/cmds/incidentd/tests/Reporter_test.cpp +++ b/cmds/incidentd/tests/Reporter_test.cpp @@ -19,12 +19,12 @@ #include <android/os/BnIncidentReportStatusListener.h> #include <frameworks/base/libs/incident/proto/android/os/header.pb.h> -#include <android-base/file.h> -#include <android-base/test_utils.h> #include <dirent.h> +#include <string.h> + +#include <android-base/file.h> #include <gmock/gmock.h> #include <gtest/gtest.h> -#include <string.h> using namespace android; using namespace android::base; @@ -197,4 +197,4 @@ TEST_F(ReporterTest, ReportMetadata) { EXPECT_EQ(1, metadata.request_size()); EXPECT_TRUE(metadata.use_dropbox()); EXPECT_EQ(0, metadata.sections_size()); -}
\ No newline at end of file +} diff --git a/cmds/incidentd/tests/Throttler_test.cpp b/cmds/incidentd/tests/Throttler_test.cpp index 8488c995c0fa..b35228c09253 100644 --- a/cmds/incidentd/tests/Throttler_test.cpp +++ b/cmds/incidentd/tests/Throttler_test.cpp @@ -16,7 +16,6 @@ #include "Throttler.h" -#include <android-base/test_utils.h> #include <gmock/gmock.h> #include <gtest/gtest.h> diff --git a/tools/aapt2/io/FileStream_test.cpp b/tools/aapt2/io/FileStream_test.cpp index 7872738320c3..cc9cd2808a0c 100644 --- a/tools/aapt2/io/FileStream_test.cpp +++ b/tools/aapt2/io/FileStream_test.cpp @@ -18,7 +18,6 @@ #include "android-base/file.h" #include "android-base/macros.h" -#include "android-base/test_utils.h" #include "test/Test.h" |