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

Commit 8dff29a3 authored by Josh Gao's avatar Josh Gao Committed by android-build-merger
Browse files

Merge changes I9b77c105,I0b369d16,I59602c20,Iae4f3d55 

am: 95a3916e

Change-Id: Id51210d30fd392e1f5b589a1a190808d6ab10300
parents 0e702ae9 95a3916e

adb/Android.bp

+3 −0
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ cc_defaults { 
        "-Wvla",

    ],

    rtti: true,

    cpp_std: "gnu++17",



    use_version_lib: true,
@@ -314,6 +315,8 @@ cc_library_static { 
        "daemon/auth.cpp",

        "daemon/jdwp_service.cpp",

        "daemon/usb.cpp",

        "daemon/usb_ffs.cpp",

        "daemon/usb_legacy.cpp",

    ],



    local_include_dirs: [

adb/daemon/include/adbd/usb.h

+2 −0
Original line number Diff line number Diff line
@@ -62,3 +62,5 @@ struct usb_handle { 
};



usb_handle *create_usb_handle(unsigned num_bufs, unsigned io_size);

bool open_functionfs(android::base::unique_fd* control, android::base::unique_fd* bulk_out,

                     android::base::unique_fd* bulk_in);