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

Commit dcbd2a15 authored by Elliott Hughes's avatar Elliott Hughes Committed by android-build-merger
Browse files

Merge "Fix macOS build." 

am: 71feb7b3

Change-Id: I2d5929947753795593088f3e18f20dc6c071e1a0
parents 4f152a5f 71feb7b3

adb/client/usb_libusb.cpp

+2 −0
Original line number Original line Diff line number Diff line
@@ -159,6 +159,7 @@ static std::string get_device_address(libusb_device* device) { 
                        libusb_get_device_address(device));

                        libusb_get_device_address(device));

}

}





#if defined(__linux__)

static std::string get_device_serial_path(libusb_device* device) {

static std::string get_device_serial_path(libusb_device* device) {

    uint8_t ports[7];

    uint8_t ports[7];

    int port_count = libusb_get_port_numbers(device, ports, 7);

    int port_count = libusb_get_port_numbers(device, ports, 7);
@@ -172,6 +173,7 @@ static std::string get_device_serial_path(libusb_device* device) { 
    path += "/serial";

    path += "/serial";

    return path;

    return path;

}

}

#endif





static bool endpoint_is_output(uint8_t endpoint) {

static bool endpoint_is_output(uint8_t endpoint) {

    return (endpoint & LIBUSB_ENDPOINT_DIR_MASK) == LIBUSB_ENDPOINT_OUT;

    return (endpoint & LIBUSB_ENDPOINT_DIR_MASK) == LIBUSB_ENDPOINT_OUT;