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

Commit 0871824d authored by Josh Gao's avatar Josh Gao
Browse files

Move adbd's legacy USB implementation to fastboot. 

This code path is effectively dead in adbd, and fastboot's dependency on
libadbd makes it hard to refactor adbd's dependencies.

Bug: http://b/150317254
Test: built and flashed aosp_walleye-eng
Change-Id: I5118136d32fdcbbd011559ed0a4a71e1dc7bf064
parent cd63cae6

adb/Android.bp

+4 −13
Original line number Diff line number Diff line
@@ -133,7 +133,6 @@ libadb_srcs = [ 
    "transport.cpp",

    "transport_fd.cpp",

    "transport_local.cpp",

    "transport_usb.cpp",

    "types.cpp",

]
@@ -169,6 +168,7 @@ cc_library_host_static { 
        "client/usb_libusb.cpp",

        "client/usb_dispatch.cpp",

        "client/transport_mdns.cpp",

        "client/transport_usb.cpp",

        "client/pairing/pairing_client.cpp",

    ],
@@ -382,10 +382,6 @@ cc_library_static { 
        "daemon/adb_wifi.cpp",

    ],



    local_include_dirs: [

        "daemon/include",

    ],



    generated_headers: ["platform_tools_version"],



    static_libs: [
@@ -422,12 +418,6 @@ cc_library_static { 
                "daemon/transport_qemu.cpp",

                "daemon/usb.cpp",

                "daemon/usb_ffs.cpp",

                "daemon/usb_legacy.cpp",

            ]

        },

        linux_glibc: {

            srcs: [

                "daemon/usb_dummy.cpp",

            ]

        },

        recovery: {
@@ -575,8 +565,9 @@ cc_library { 
        "libmdnssd",

    ],



    export_include_dirs: [

        "daemon/include",

    visibility: [

        "//bootable/recovery/minadbd",

        "//system/core/adb",

    ],

}

adb/adb.cpp

+4 −0
Original line number Diff line number Diff line
@@ -66,6 +66,10 @@ using namespace std::chrono_literals; 
#include "daemon/logging.h"

#endif



#if ADB_HOST

#include "client/usb.h"

#endif



std::string adb_version() {

    // Don't change the format of this --- it's parsed by ddmlib.

    return android::base::StringPrintf(

adb/adb.h

+1 −2
Original line number Diff line number Diff line
@@ -29,7 +29,6 @@ 
#include "fdevent/fdevent.h"

#include "socket.h"

#include "types.h"

#include "usb.h"



constexpr size_t MAX_PAYLOAD_V1 = 4 * 1024;

constexpr size_t MAX_PAYLOAD = 1024 * 1024;
@@ -139,7 +138,6 @@ int adb_server_main(int is_daemon, const std::string& socket_spec, int ack_reply 


/* initialize a transport object's func pointers and state */

int init_socket_transport(atransport* t, unique_fd s, int port, int local);

void init_usb_transport(atransport* t, usb_handle* usb);



std::string getEmulatorSerialString(int console_port);

#if ADB_HOST
@@ -253,4 +251,5 @@ void update_transport_status(); 
// Wait until device scan has completed and every transport is ready, or a timeout elapses.

void adb_wait_for_device_initialization();



void usb_init();

#endif

adb/client/main.cpp

+1 −0
Original line number Diff line number Diff line
@@ -36,6 +36,7 @@ 
#include "adb_listeners.h"

#include "adb_utils.h"

#include "adb_wifi.h"

#include "client/usb.h"

#include "commandline.h"

#include "sysdeps/chrono.h"

#include "transport.h"

adb/transport_usb.cpp→adb/client/transport_usb.cpp

+6 −2
Original line number Diff line number Diff line
@@ -16,6 +16,10 @@ 


#define TRACE_TAG TRANSPORT



#include "sysdeps.h"



#include "client/usb.h"



#include <memory>



#include "sysdeps.h"
@@ -135,8 +139,8 @@ static int remote_read(apacket* p, usb_handle* usb) { 
        }



        p->payload.resize(p->msg.data_length);

        if (usb_read(usb, &p->payload[0], p->payload.size())

                != static_cast<int>(p->payload.size())) {

        if (usb_read(usb, &p->payload[0], p->payload.size()) !=

            static_cast<int>(p->payload.size())) {

            PLOG(ERROR) << "remote usb: terminated (data)";

            return -1;

        }