You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
122 lines
4.5 KiB
122 lines
4.5 KiB
diff --git a/adb/adb_client.h b/adb/adb_client.h
|
|
index 9f9eb1f..5355ade 100644
|
|
--- a/adb/adb_client.h
|
|
+++ b/adb/adb_client.h
|
|
@@ -25,8 +25,8 @@
|
|
|
|
// Connect to adb, connect to the named service, and return a valid fd for
|
|
// interacting with that service upon success or a negative number on failure.
|
|
-int adb_connect(const std::string& service, std::string* _Nonnull error);
|
|
-int _adb_connect(const std::string& service, std::string* _Nonnull error);
|
|
+int adb_connect(const std::string& service, std::string* error);
|
|
+int _adb_connect(const std::string& service, std::string* error);
|
|
|
|
// Connect to adb, connect to the named service, returns true if the connection
|
|
// succeeded AND the service returned OKAY. Outputs any returned error otherwise.
|
|
@@ -34,36 +34,36 @@ bool adb_command(const std::string& service);
|
|
|
|
// Connects to the named adb service and fills 'result' with the response.
|
|
// Returns true on success; returns false and fills 'error' on failure.
|
|
-bool adb_query(const std::string& service, std::string* _Nonnull result,
|
|
- std::string* _Nonnull error);
|
|
+bool adb_query(const std::string& service, std::string* result,
|
|
+ std::string* error);
|
|
|
|
// Set the preferred transport to connect to.
|
|
-void adb_set_transport(TransportType type, const char* _Nullable serial);
|
|
+void adb_set_transport(TransportType type, const char* serial);
|
|
|
|
// Get the preferred transport to connect to.
|
|
-void adb_get_transport(TransportType* _Nullable type, const char* _Nullable* _Nullable serial);
|
|
+void adb_get_transport(TransportType* type, const char** serial);
|
|
|
|
// Set TCP specifics of the transport to use.
|
|
void adb_set_tcp_specifics(int server_port);
|
|
|
|
// Set TCP Hostname of the transport to use.
|
|
-void adb_set_tcp_name(const char* _Nullable hostname);
|
|
+void adb_set_tcp_name(const char* hostname);
|
|
|
|
// Send commands to the current emulator instance. Will fail if there is not
|
|
// exactly one emulator connected (or if you use -s <serial> with a <serial>
|
|
// that does not designate an emulator).
|
|
-int adb_send_emulator_command(int argc, const char* _Nonnull* _Nonnull argv,
|
|
- const char* _Nullable serial);
|
|
+int adb_send_emulator_command(int argc, const char** argv,
|
|
+ const char* serial);
|
|
|
|
// Reads a standard adb status response (OKAY|FAIL) and returns true in the
|
|
// event of OKAY, false in the event of FAIL or protocol error.
|
|
-bool adb_status(int fd, std::string* _Nonnull error);
|
|
+bool adb_status(int fd, std::string* error);
|
|
|
|
// Create a host command corresponding to selected transport type/serial.
|
|
-std::string format_host_command(const char* _Nonnull command, TransportType type,
|
|
- const char* _Nullable serial);
|
|
+std::string format_host_command(const char* command, TransportType type,
|
|
+ const char* serial);
|
|
|
|
// Get the feature set of the current preferred transport.
|
|
-bool adb_get_feature_set(FeatureSet* _Nonnull feature_set, std::string* _Nonnull error);
|
|
+bool adb_get_feature_set(FeatureSet* feature_set, std::string* error);
|
|
|
|
#endif
|
|
diff --git a/base/errors_unix.cpp b/base/errors_unix.cpp
|
|
index 296995e..3b983d3 100644
|
|
--- a/base/errors_unix.cpp
|
|
+++ b/base/errors_unix.cpp
|
|
@@ -17,6 +17,7 @@
|
|
#include "android-base/errors.h"
|
|
|
|
#include <errno.h>
|
|
+#include <cstring>
|
|
|
|
namespace android {
|
|
namespace base {
|
|
diff --git a/base/file.cpp b/base/file.cpp
|
|
index da1adba..aed93d6 100644
|
|
--- a/base/file.cpp
|
|
+++ b/base/file.cpp
|
|
@@ -21,7 +21,7 @@
|
|
#include <sys/stat.h>
|
|
#include <sys/types.h>
|
|
|
|
-#include <string>
|
|
+#include <cstring>
|
|
|
|
#include "android-base/macros.h" // For TEMP_FAILURE_RETRY on Darwin.
|
|
#include "android-base/utf8.h"
|
|
diff --git a/base/logging.cpp b/base/logging.cpp
|
|
index 1741871..a80cae9 100644
|
|
--- a/base/logging.cpp
|
|
+++ b/base/logging.cpp
|
|
@@ -32,7 +32,7 @@
|
|
#include <iostream>
|
|
#include <limits>
|
|
#include <sstream>
|
|
-#include <string>
|
|
+#include <cstring>
|
|
#include <utility>
|
|
#include <vector>
|
|
|
|
diff --git a/fastboot/socket.h b/fastboot/socket.h
|
|
index de543db..b53d2b0 100644
|
|
--- a/fastboot/socket.h
|
|
+++ b/fastboot/socket.h
|
|
@@ -41,7 +41,6 @@
|
|
|
|
#include <android-base/macros.h>
|
|
#include <cutils/sockets.h>
|
|
-#include <gtest/gtest_prod.h>
|
|
|
|
// Socket interface to be implemented for each platform.
|
|
class Socket {
|
|
@@ -120,8 +119,6 @@ class Socket {
|
|
socket_send_buffers_function_ = &socket_send_buffers;
|
|
|
|
private:
|
|
- FRIEND_TEST(SocketTest, TestTcpSendBuffers);
|
|
- FRIEND_TEST(SocketTest, TestUdpSendBuffers);
|
|
|
|
DISALLOW_COPY_AND_ASSIGN(Socket);
|
|
};
|
|
|