From 57e09b16ca94618b17ccd5b74caec894df977f28 Mon Sep 17 00:00:00 2001 From: Josh Gao Date: Fri, 28 Jun 2019 13:50:37 -0700 Subject: [PATCH] adb: move fdevent to its own folder. Preparatory refactoring for platform-specific implementations. Test: mma Change-Id: I0f600122ac89241788c5f3300f362fd9ef02ddcd --- adb/Android.bp | 4 ++-- adb/adb.h | 2 +- adb/adb_listeners_test.cpp | 2 +- adb/client/transport_mdns.cpp | 2 +- adb/daemon/auth.cpp | 2 +- adb/daemon/framebuffer_service.cpp | 1 - adb/{ => fdevent}/fdevent.cpp | 0 adb/{ => fdevent}/fdevent.h | 0 adb/{ => fdevent}/fdevent_test.cpp | 0 adb/{ => fdevent}/fdevent_test.h | 0 adb/socket.h | 2 +- adb/socket_test.cpp | 4 ++-- adb/sysdeps.h | 2 -- adb/transport.cpp | 2 +- adb/transport_test.cpp | 2 +- 15 files changed, 11 insertions(+), 14 deletions(-) rename adb/{ => fdevent}/fdevent.cpp (100%) rename adb/{ => fdevent}/fdevent.h (100%) rename adb/{ => fdevent}/fdevent_test.cpp (100%) rename adb/{ => fdevent}/fdevent_test.h (100%) diff --git a/adb/Android.bp b/adb/Android.bp index b6aff3ee5..583248b62 100644 --- a/adb/Android.bp +++ b/adb/Android.bp @@ -124,7 +124,7 @@ libadb_srcs = [ "adb_trace.cpp", "adb_unique_fd.cpp", "adb_utils.cpp", - "fdevent.cpp", + "fdevent/fdevent.cpp", "services.cpp", "sockets.cpp", "socket_spec.cpp", @@ -144,7 +144,7 @@ libadb_test_srcs = [ "adb_io_test.cpp", "adb_listeners_test.cpp", "adb_utils_test.cpp", - "fdevent_test.cpp", + "fdevent/fdevent_test.cpp", "socket_spec_test.cpp", "socket_test.cpp", "sysdeps_test.cpp", diff --git a/adb/adb.h b/adb/adb.h index 3a6f059b8..352b2fe1e 100644 --- a/adb/adb.h +++ b/adb/adb.h @@ -26,7 +26,7 @@ #include #include "adb_trace.h" -#include "fdevent.h" +#include "fdevent/fdevent.h" #include "socket.h" #include "types.h" #include "usb.h" diff --git a/adb/adb_listeners_test.cpp b/adb/adb_listeners_test.cpp index b697769d2..a7e2deaf6 100644 --- a/adb/adb_listeners_test.cpp +++ b/adb/adb_listeners_test.cpp @@ -21,7 +21,7 @@ #include #include -#include "fdevent.h" +#include "fdevent/fdevent.h" #include "sysdeps.h" #include "transport.h" diff --git a/adb/client/transport_mdns.cpp b/adb/client/transport_mdns.cpp index 283fac554..1a34384d2 100644 --- a/adb/client/transport_mdns.cpp +++ b/adb/client/transport_mdns.cpp @@ -31,7 +31,7 @@ #include "adb_mdns.h" #include "adb_trace.h" -#include "fdevent.h" +#include "fdevent/fdevent.h" #include "sysdeps.h" static DNSServiceRef service_ref; diff --git a/adb/daemon/auth.cpp b/adb/daemon/auth.cpp index 00268a71b..2b8f4617f 100644 --- a/adb/daemon/auth.cpp +++ b/adb/daemon/auth.cpp @@ -19,7 +19,7 @@ #include "adb.h" #include "adb_auth.h" #include "adb_io.h" -#include "fdevent.h" +#include "fdevent/fdevent.h" #include "sysdeps.h" #include "transport.h" diff --git a/adb/daemon/framebuffer_service.cpp b/adb/daemon/framebuffer_service.cpp index 2a6418ade..676f8e9db 100644 --- a/adb/daemon/framebuffer_service.cpp +++ b/adb/daemon/framebuffer_service.cpp @@ -33,7 +33,6 @@ #include "adb.h" #include "adb_io.h" #include "adb_utils.h" -#include "fdevent.h" /* TODO: ** - sync with vsync to avoid tearing diff --git a/adb/fdevent.cpp b/adb/fdevent/fdevent.cpp similarity index 100% rename from adb/fdevent.cpp rename to adb/fdevent/fdevent.cpp diff --git a/adb/fdevent.h b/adb/fdevent/fdevent.h similarity index 100% rename from adb/fdevent.h rename to adb/fdevent/fdevent.h diff --git a/adb/fdevent_test.cpp b/adb/fdevent/fdevent_test.cpp similarity index 100% rename from adb/fdevent_test.cpp rename to adb/fdevent/fdevent_test.cpp diff --git a/adb/fdevent_test.h b/adb/fdevent/fdevent_test.h similarity index 100% rename from adb/fdevent_test.h rename to adb/fdevent/fdevent_test.h diff --git a/adb/socket.h b/adb/socket.h index b8c559a90..4276851d2 100644 --- a/adb/socket.h +++ b/adb/socket.h @@ -24,7 +24,7 @@ #include #include "adb_unique_fd.h" -#include "fdevent.h" +#include "fdevent/fdevent.h" #include "types.h" class atransport; diff --git a/adb/socket_test.cpp b/adb/socket_test.cpp index 5e28f7601..1601ff0ac 100644 --- a/adb/socket_test.cpp +++ b/adb/socket_test.cpp @@ -14,7 +14,7 @@ * limitations under the License. */ -#include "fdevent.h" +#include "fdevent/fdevent.h" #include @@ -29,7 +29,7 @@ #include "adb.h" #include "adb_io.h" -#include "fdevent_test.h" +#include "fdevent/fdevent_test.h" #include "socket.h" #include "sysdeps.h" #include "sysdeps/chrono.h" diff --git a/adb/sysdeps.h b/adb/sysdeps.h index 78abba54a..b0e7fa097 100644 --- a/adb/sysdeps.h +++ b/adb/sysdeps.h @@ -64,8 +64,6 @@ #include // unique_ptr #include -#include "fdevent.h" - #define OS_PATH_SEPARATORS "\\/" #define OS_PATH_SEPARATOR '\\' #define OS_PATH_SEPARATOR_STR "\\" diff --git a/adb/transport.cpp b/adb/transport.cpp index 841865afc..8bc925fab 100644 --- a/adb/transport.cpp +++ b/adb/transport.cpp @@ -49,7 +49,7 @@ #include "adb_io.h" #include "adb_trace.h" #include "adb_utils.h" -#include "fdevent.h" +#include "fdevent/fdevent.h" #include "sysdeps/chrono.h" using android::base::ScopedLockAssertion; diff --git a/adb/transport_test.cpp b/adb/transport_test.cpp index b66f8fa80..00beb3a2b 100644 --- a/adb/transport_test.cpp +++ b/adb/transport_test.cpp @@ -19,7 +19,7 @@ #include #include "adb.h" -#include "fdevent_test.h" +#include "fdevent/fdevent_test.h" struct TransportTest : public FdeventTest {};