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

Commit bd4becb0 authored by Josh Gao's avatar Josh Gao Committed by Automerger Merge Worker
Browse files

Move adbd's legacy USB implementation to fastboot. am: 27831220 

Change-Id: I3ce734a34199dad7f3da8b365723d92bb2622b95
parents b26e80f3 27831220

adb/Android.bp

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

    "transport.cpp",

    "transport_fd.cpp",

    "transport_fd.cpp",

    "transport_local.cpp",

    "transport_local.cpp",

    "transport_usb.cpp",

    "types.cpp",

    "types.cpp",

]

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

        "client/usb_libusb.cpp",

        "client/usb_dispatch.cpp",

        "client/usb_dispatch.cpp",

        "client/transport_mdns.cpp",

        "client/transport_mdns.cpp",

        "client/transport_usb.cpp",

        "client/pairing/pairing_client.cpp",

        "client/pairing/pairing_client.cpp",

    ],

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

        "daemon/adb_wifi.cpp",

    ],

    ],





    local_include_dirs: [

        "daemon/include",

    ],



    generated_headers: ["platform_tools_version"],

    generated_headers: ["platform_tools_version"],





    static_libs: [

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

                "daemon/transport_qemu.cpp",

                "daemon/usb.cpp",

                "daemon/usb.cpp",

                "daemon/usb_ffs.cpp",

                "daemon/usb_ffs.cpp",

                "daemon/usb_legacy.cpp",

            ]

        },

        linux_glibc: {

            srcs: [

                "daemon/usb_dummy.cpp",

            ]

            ]

        },

        },

        recovery: {

        recovery: {
@@ -544,8 +534,9 @@ cc_library { 
        "libmdnssd",

        "libmdnssd",

    ],

    ],





    export_include_dirs: [

    visibility: [

        "daemon/include",

        "//bootable/recovery/minadbd",

        "//system/core/adb",

    ],

    ],

}

}

adb/adb.cpp

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

#include "daemon/logging.h"

#endif

#endif





#if ADB_HOST

#include "client/usb.h"

#endif



std::string adb_version() {

std::string adb_version() {

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

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

    return android::base::StringPrintf(

    return android::base::StringPrintf(

adb/adb.h

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

#include "fdevent/fdevent.h"

#include "socket.h"

#include "socket.h"

#include "types.h"

#include "types.h"

#include "usb.h"





constexpr size_t MAX_PAYLOAD_V1 = 4 * 1024;

constexpr size_t MAX_PAYLOAD_V1 = 4 * 1024;

constexpr size_t MAX_PAYLOAD = 1024 * 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 */

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

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

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);

std::string getEmulatorSerialString(int console_port);

#if ADB_HOST

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

// Wait until device scan has completed and every transport is ready, or a timeout elapses.

void adb_wait_for_device_initialization();

void adb_wait_for_device_initialization();





void usb_init();

#endif
 
#endif

adb/client/main.cpp

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

#include "adb_listeners.h"

#include "adb_utils.h"

#include "adb_utils.h"

#include "adb_wifi.h"

#include "adb_wifi.h"

#include "client/usb.h"

#include "commandline.h"

#include "commandline.h"

#include "sysdeps/chrono.h"

#include "sysdeps/chrono.h"

#include "transport.h"

#include "transport.h"

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

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




#define TRACE_TAG TRANSPORT

#define TRACE_TAG TRANSPORT





#include "sysdeps.h"



#include "client/usb.h"



#include <memory>

#include <memory>





#include "sysdeps.h"

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

        }





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

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

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

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

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

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

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

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

            return -1;

            return -1;

        }

        }