Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge changes I664fb325,I5e289469 am: 701001688f

Browse Source 
am: 833a491fab

Change-Id: If9ccdbfe5ee734c9cbd95a0c7bef04e6336d6f48
This commit is contained in:
Mark Salyzyn
2018-11-19 13:33:13 -08:00
committed by android-build-merger
parent f1c1db0153 833a491fab
commit beea2153ab
5 changed files with 7 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
cmds/incident_helper/tests/ih_util_test.cpp
View File

@@ -17,7 +17,6 @@
#include "ih_util.h" #include "ih_util.h"
#include <android-base/file.h> #include <android-base/file.h>
#include <android-base/test_utils.h>
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <string> #include <string>

6
cmds/incidentd/tests/FdBuffer_test.cpp
View File

@@ -17,13 +17,13 @@
#include "FdBuffer.h" #include "FdBuffer.h"
#include "incidentd_util.h" #include "incidentd_util.h"
#include <android-base/file.h>
#include <android-base/test_utils.h>
#include <fcntl.h> #include <fcntl.h>
#include <gtest/gtest.h>
#include <signal.h> #include <signal.h>
#include <string.h> #include <string.h>
#include <android-base/file.h>
#include <gtest/gtest.h>
using namespace android; using namespace android;
using namespace android::base; using namespace android::base;
using namespace android::os::incidentd; using namespace android::os::incidentd;

6
cmds/incidentd/tests/Reporter_test.cpp
View File

@@ -19,12 +19,12 @@
#include <android/os/BnIncidentReportStatusListener.h> #include <android/os/BnIncidentReportStatusListener.h>
#include <frameworks/base/libs/incident/proto/android/os/header.pb.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 <dirent.h>
#include <string.h>
#include <android-base/file.h>
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>
#include <string.h>
using namespace android; using namespace android;
using namespace android::base; using namespace android::base;

1
cmds/incidentd/tests/Throttler_test.cpp
View File

@@ -16,7 +16,6 @@
#include "Throttler.h" #include "Throttler.h"
#include <android-base/test_utils.h>
#include <gmock/gmock.h> #include <gmock/gmock.h>
#include <gtest/gtest.h> #include <gtest/gtest.h>

1
tools/aapt2/io/FileStream_test.cpp
View File

@@ -18,7 +18,6 @@
#include "android-base/file.h" #include "android-base/file.h"
#include "android-base/macros.h" #include "android-base/macros.h"
#include "android-base/test_utils.h"
#include "test/Test.h" #include "test/Test.h"