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

Commit e2a9563b authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Track rename of base/ to android-base/." 

am: 912ed3d8

* commit '912ed3d8':
  Track rename of base/ to android-base/.
parents ce0c6c5f 912ed3d8

adb/adb.cpp

+4 −4
Original line number Diff line number Diff line
@@ -33,10 +33,10 @@ 
#include <string>

#include <vector>



#include <base/logging.h>

#include <base/macros.h>

#include <base/stringprintf.h>

#include <base/strings.h>

#include <android-base/logging.h>

#include <android-base/macros.h>

#include <android-base/stringprintf.h>

#include <android-base/strings.h>



#include "adb_auth.h"

#include "adb_io.h"

adb/adb.h

+1 −1
Original line number Diff line number Diff line
@@ -22,7 +22,7 @@ 


#include <string>



#include <base/macros.h>

#include <android-base/macros.h>



#include "adb_trace.h"

#include "fdevent.h"

adb/adb_auth_host.cpp

+1 −1
Original line number Diff line number Diff line
@@ -43,7 +43,7 @@ 
#include "mincrypt/rsa.h"

#undef RSA_verify



#include <base/strings.h>

#include <android-base/strings.h>

#include <cutils/list.h>



#include <openssl/evp.h>

adb/adb_client.cpp

+2 −2
Original line number Diff line number Diff line
@@ -31,8 +31,8 @@ 
#include <string>

#include <vector>



#include <base/stringprintf.h>

#include <base/strings.h>

#include <android-base/stringprintf.h>

#include <android-base/strings.h>

#include <cutils/sockets.h>



#include "adb_io.h"

adb/adb_io.cpp

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ 


#include <unistd.h>



#include <base/stringprintf.h>

#include <android-base/stringprintf.h>



#include "adb_trace.h"

#include "adb_utils.h"