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

Commit 88d23135 authored by Josh Gao's avatar Josh Gao Committed by Gerrit Code Review
Browse files

Merge changes from topic "fdevent_refactor" 

* changes:
  adb: fdevent: extract Add/Del/SetTimeout.
  adb: fdevent: extract Create/Destroy from fdevent_context_poll.
  adb: fdevent: move TerminateLoop to fdevent_context.
  adb: fdevent: move CheckMainThread logic to fdevent_context.
  adb: fdevent: delete FDE_CREATED.
  adb: fdevent: move run queue to fdevent_context.
  adb: implement fdevent_reset by constructing a new context.
  adb: move fdevent implementation out to a separate file.
  adb: de-globalize fdevent context.
  adb: move fdevent to its own folder.
  adb: add superfluous include.
parents 343ce615 35b29360

adb/Android.bp

+3 −2
Original line number Diff line number Diff line
@@ -124,7 +124,8 @@ libadb_srcs = [ 
    "adb_trace.cpp",

    "adb_unique_fd.cpp",

    "adb_utils.cpp",

    "fdevent.cpp",

    "fdevent/fdevent.cpp",

    "fdevent/fdevent_poll.cpp",

    "services.cpp",

    "sockets.cpp",

    "socket_spec.cpp",
@@ -144,7 +145,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",

adb/adb.h

+1 −1
Original line number Diff line number Diff line
@@ -26,7 +26,7 @@ 
#include <android-base/macros.h>



#include "adb_trace.h"

#include "fdevent.h"

#include "fdevent/fdevent.h"

#include "socket.h"

#include "types.h"

#include "usb.h"

adb/adb_listeners_test.cpp

+1 −1
Original line number Diff line number Diff line
@@ -21,7 +21,7 @@ 
#include <android-base/stringprintf.h>

#include <android-base/strings.h>



#include "fdevent.h"

#include "fdevent/fdevent.h"

#include "sysdeps.h"

#include "transport.h"

adb/client/transport_mdns.cpp

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

adb/daemon/auth.cpp

+2 −1
Original line number Diff line number Diff line
@@ -18,7 +18,8 @@ 


#include "adb.h"

#include "adb_auth.h"

#include "fdevent.h"

#include "adb_io.h"

#include "fdevent/fdevent.h"

#include "sysdeps.h"

#include "transport.h"