summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Gao <jmgao@google.com>2018-08-06 18:36:58 -0700
committerJosh Gao <jmgao@google.com>2018-08-06 18:50:10 -0700
commit9d100f1043b629373f28b85de12c4e9b80d270bf (patch)
tree9605c1c1ef782a3b5625b373326222c2dc6a0824
parentce841d91fb80f2f87aa43a82b8800704d324a99c (diff)
downloadsystem_core-9d100f1043b629373f28b85de12c4e9b80d270bf.tar.gz
system_core-9d100f1043b629373f28b85de12c4e9b80d270bf.tar.bz2
system_core-9d100f1043b629373f28b85de12c4e9b80d270bf.zip
adb: move AdbCloser to its rightful place.
Test: mma Change-Id: Ie74c49e8abf72f594a35d04b2b0d99b96f58f8d0
-rw-r--r--adb/adb_unique_fd.cpp4
-rw-r--r--adb/adb_utils.cpp4
2 files changed, 4 insertions, 4 deletions
diff --git a/adb/adb_unique_fd.cpp b/adb/adb_unique_fd.cpp
index 2079be152..58e768e13 100644
--- a/adb/adb_unique_fd.cpp
+++ b/adb/adb_unique_fd.cpp
@@ -21,6 +21,10 @@
#include "sysdeps.h"
+void AdbCloser::Close(int fd) {
+ adb_close(fd);
+}
+
#if !defined(_WIN32)
bool Pipe(unique_fd* read, unique_fd* write, int flags) {
int pipefd[2];
diff --git a/adb/adb_utils.cpp b/adb/adb_utils.cpp
index 0c3327fc3..ffac315b3 100644
--- a/adb/adb_utils.cpp
+++ b/adb/adb_utils.cpp
@@ -274,10 +274,6 @@ std::string adb_get_android_dir_path() {
return android_dir;
}
-void AdbCloser::Close(int fd) {
- adb_close(fd);
-}
-
int syntax_error(const char* fmt, ...) {
fprintf(stderr, "adb: usage: ");