Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 634efd99 authored by Mark Salyzyn's avatar Mark Salyzyn Committed by android-build-merger
Browse files

Merge "switch to using android-base/file.h instead of android-base/test_utils.h" 

am: b9cb1494

Change-Id: I0522130d4c6e2540f5149780a9b40103a94e450e
parents 1e266b14 b9cb1494

adb/adb_io_test.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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

adb/adb_utils_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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) {

adb/client/adb_install.cpp

+0 −1
Original line number Diff line number Diff line
@@ -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"

adb/sysdeps/stat_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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"

adb/sysdeps_win32_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -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