aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge "Add missing host ldlibs" am: c830898c12 am: beeecbd623android-wear-o-preview-4android-wear-o-preview-3android-wear-8.1.0_r1android-wear-8.0.0_r2android-wear-8.0.0_r1android-vts-8.1_r9android-vts-8.1_r8android-vts-8.1_r7android-vts-8.1_r6android-vts-8.1_r5android-vts-8.1_r4android-vts-8.1_r3android-vts-8.1_r13android-vts-8.1_r12android-vts-8.1_r11android-vts-8.1_r10android-vts-8.0_r9android-vts-8.0_r8android-vts-8.0_r7android-vts-8.0_r6android-vts-8.0_r2android-vts-8.0_r13android-vts-8.0_r12android-vts-8.0_r11android-vts-8.0_r10android-vts-8.0_r1android-o-preview-4android-o-preview-3android-o-preview-2android-o-preview-1android-o-mr1-preview-2android-o-mr1-preview-1android-o-mr1-iot-release-smart-display-r9android-o-mr1-iot-release-smart-display-r8android-o-mr1-iot-release-smart-display-r5android-o-mr1-iot-release-smart-display-r4android-o-mr1-iot-release-smart-display-r3android-o-mr1-iot-release-smart-display-r22android-o-mr1-iot-release-smart-display-r14android-o-mr1-iot-release-smart-clock-r6android-o-mr1-iot-release-smart-clock-r2android-o-mr1-iot-release-smart-clock-fsiandroid-o-mr1-iot-release-smart-clock-fcsandroid-o-mr1-iot-release-1.0.8android-o-mr1-iot-release-1.0.7android-o-mr1-iot-release-1.0.5android-o-mr1-iot-release-1.0.4android-o-mr1-iot-release-1.0.3android-o-mr1-iot-release-1.0.2android-o-mr1-iot-release-1.0.14android-o-mr1-iot-release-1.0.13android-o-mr1-iot-release-1.0.12android-o-mr1-iot-release-1.0.10android-o-mr1-iot-release-1.0.1android-o-mr1-iot-release-1.0.0android-o-mr1-iot-preview-8android-o-mr1-iot-preview-7android-o-mr1-iot-preview-6android-o-iot-preview-5android-cts-8.1_r9android-cts-8.1_r8android-cts-8.1_r7android-cts-8.1_r6android-cts-8.1_r5android-cts-8.1_r4android-cts-8.1_r3android-cts-8.1_r20android-cts-8.1_r2android-cts-8.1_r19android-cts-8.1_r18android-cts-8.1_r17android-cts-8.1_r16android-cts-8.1_r15android-cts-8.1_r14android-cts-8.1_r13android-cts-8.1_r12android-cts-8.1_r11android-cts-8.1_r10android-cts-8.1_r1android-cts-8.0_r9android-cts-8.0_r8android-cts-8.0_r7android-cts-8.0_r6android-cts-8.0_r5android-cts-8.0_r4android-cts-8.0_r3android-cts-8.0_r24android-cts-8.0_r23android-cts-8.0_r22android-cts-8.0_r21android-cts-8.0_r20android-cts-8.0_r2android-cts-8.0_r19android-cts-8.0_r18android-cts-8.0_r17android-cts-8.0_r16android-cts-8.0_r15android-cts-8.0_r14android-cts-8.0_r13android-cts-8.0_r12android-cts-8.0_r11android-cts-8.0_r10android-cts-8.0_r1android-8.1.0_r9android-8.1.0_r80android-8.1.0_r8android-8.1.0_r79android-8.1.0_r78android-8.1.0_r77android-8.1.0_r76android-8.1.0_r75android-8.1.0_r74android-8.1.0_r73android-8.1.0_r72android-8.1.0_r71android-8.1.0_r70android-8.1.0_r7android-8.1.0_r69android-8.1.0_r68android-8.1.0_r67android-8.1.0_r66android-8.1.0_r65android-8.1.0_r64android-8.1.0_r63android-8.1.0_r62android-8.1.0_r61android-8.1.0_r60android-8.1.0_r6android-8.1.0_r53android-8.1.0_r52android-8.1.0_r51android-8.1.0_r50android-8.1.0_r5android-8.1.0_r48android-8.1.0_r47android-8.1.0_r46android-8.1.0_r45android-8.1.0_r43android-8.1.0_r42android-8.1.0_r41android-8.1.0_r40android-8.1.0_r4android-8.1.0_r39android-8.1.0_r38android-8.1.0_r37android-8.1.0_r36android-8.1.0_r35android-8.1.0_r33android-8.1.0_r32android-8.1.0_r31android-8.1.0_r30android-8.1.0_r3android-8.1.0_r29android-8.1.0_r28android-8.1.0_r27android-8.1.0_r26android-8.1.0_r25android-8.1.0_r23android-8.1.0_r22android-8.1.0_r21android-8.1.0_r20android-8.1.0_r2android-8.1.0_r19android-8.1.0_r18android-8.1.0_r17android-8.1.0_r16android-8.1.0_r15android-8.1.0_r14android-8.1.0_r13android-8.1.0_r12android-8.1.0_r11android-8.1.0_r10android-8.1.0_r1android-8.0.0_r9android-8.0.0_r7android-8.0.0_r50android-8.0.0_r49android-8.0.0_r48android-8.0.0_r47android-8.0.0_r46android-8.0.0_r45android-8.0.0_r44android-8.0.0_r43android-8.0.0_r42android-8.0.0_r41android-8.0.0_r40android-8.0.0_r4android-8.0.0_r39android-8.0.0_r38android-8.0.0_r37android-8.0.0_r36android-8.0.0_r35android-8.0.0_r34android-8.0.0_r33android-8.0.0_r32android-8.0.0_r31android-8.0.0_r30android-8.0.0_r3android-8.0.0_r29android-8.0.0_r28android-8.0.0_r27android-8.0.0_r26android-8.0.0_r25android-8.0.0_r24android-8.0.0_r23android-8.0.0_r22android-8.0.0_r21android-8.0.0_r2android-8.0.0_r17android-8.0.0_r16android-8.0.0_r15android-8.0.0_r13android-8.0.0_r12android-8.0.0_r11android-8.0.0_r10android-8.0.0_r1security-oc-releasesecurity-oc-mr1-releaseoreo-vts-releaseoreo-security-releaseoreo-releaseoreo-r6-releaseoreo-r5-releaseoreo-r4-releaseoreo-r3-releaseoreo-r2-releaseoreo-mr1-wear-releaseoreo-mr1-vts-releaseoreo-mr1-security-releaseoreo-mr1-s1-releaseoreo-mr1-releaseoreo-mr1-iot-releaseoreo-mr1-devoreo-mr1-cuttlefish-testingoreo-mr1-cts-releaseoreo-mr1-1.2-iot-releaseoreo-m8-releaseoreo-m7-releaseoreo-m6-s4-releaseoreo-m6-s3-releaseoreo-m6-s2-releaseoreo-m5-releaseoreo-m4-s9-releaseoreo-m4-s8-releaseoreo-m4-s7-releaseoreo-m4-s6-releaseoreo-m4-s5-releaseoreo-m4-s4-releaseoreo-m4-s3-releaseoreo-m4-s2-releaseoreo-m4-s12-releaseoreo-m4-s11-releaseoreo-m4-s10-releaseoreo-m4-s1-releaseoreo-m3-releaseoreo-m2-s5-releaseoreo-m2-s4-releaseoreo-m2-s3-releaseoreo-m2-s2-releaseoreo-m2-s1-releaseoreo-m2-releaseoreo-dr3-releaseoreo-dr2-releaseoreo-dr1-releaseoreo-dr1-devoreo-devoreo-cts-releaseo-preview-4o-preview-3o-preview-2o-previewo-mr1-iot-preview-8o-mr1-iot-preview-7o-mr1-iot-preview-6o-iot-preview-5Colin Cross2016-10-211-0/+4
|\
| * Merge "Add missing host ldlibs" am: c830898c12Colin Cross2016-10-211-0/+4
| |\
| | * Merge "Add missing host ldlibs"Colin Cross2016-10-211-0/+4
| |/|
| | * Merge "Add missing host ldlibs"Treehugger Robot2016-10-211-0/+4
| | |\
| | | * Add missing host ldlibsColin Cross2016-10-211-0/+4
| | |/
* | | Merge "Add support for building libusb." am: 24970bd1df am: f99006eca4 am: bc...Josh Gao2016-10-0611-0/+571
|\| |
| * | Merge "Add support for building libusb." am: 24970bd1df am: f99006eca4Josh Gao2016-10-0611-0/+571
| |\ \
| | * \ Merge "Add support for building libusb." am: 24970bd1dfJosh Gao2016-10-0611-0/+571
| | |\ \
| | | * | Merge "Add support for building libusb."Josh Gao2016-10-0611-0/+571
| | | |\|
| | | | * Merge "Add support for building libusb."Josh Gao2016-10-0611-0/+571
| | | | |\
| | | | | * Add support for building libusb.Josh Gao2016-09-2911-0/+571
* | | | | | Merge changes I428f96cf,I55cd008b am: f1e086cda3 am: 9f285464e7 am: c2f623da0dJosh Gao2016-10-060-0/+0
|\| | | | |
| * | | | | Merge changes I428f96cf,I55cd008b am: f1e086cda3 am: 9f285464e7Josh Gao2016-10-060-0/+0
| |\| | | |
| | * | | | Merge changes I428f96cf,I55cd008b am: f1e086cda3Josh Gao2016-10-060-0/+0
| | |\| | |
| | | * | | Merge changes I428f96cf,I55cd008bJosh Gao2016-10-060-0/+0
| | | |\| |
| | | | * | Merge changes I428f96cf,I55cd008bJosh Gao2016-10-06219-44128/+49540
| | | | |\|
* | | | | | Merge remote-tracking branch 'aosp/upstream-master' into adb_libusb am: 12258...Josh Gao2016-10-06201-0/+60133
|\| | | | |
| * | | | | Merge remote-tracking branch 'aosp/upstream-master' into adb_libusb am: 12258...Josh Gao2016-10-06201-0/+60133
| |\| | | |
| | * | | | Merge remote-tracking branch 'aosp/upstream-master' into adb_libusb am: 12258...Josh Gao2016-10-06201-0/+60133
| | |\| | |
| | | * | | Merge remote-tracking branch 'aosp/upstream-master' into adb_libusbJosh Gao2016-10-06201-0/+60133
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Merge remote-tracking branch 'aosp/upstream-master' into adb_libusbJosh Gao2016-09-28201-0/+60133
| | | | |\ \
| | | | | * | darwin: fix OSAtomicAdd32Barrier argument orderingNathan Hjelm2016-09-212-2/+2
| | | | | * | on to 1.0.21-rc5Nathan Hjelm2016-09-143-2/+3
| | | | | * | Fixed Obj-C GC support; fix pthread nameSean McBride2016-09-142-4/+8
| | | | | * | README: fix my email addressNathan Hjelm2016-09-122-2/+2
| | | | | * | darwin: fix typoNathan Hjelm2016-09-122-2/+2
| | | | | * | on to 1.0.21-rc4Nathan Hjelm2016-09-123-3/+6
| | | | | * | darwin: do not use deprecated OSAtomicIncrement32Barrier in 10.12Nathan Hjelm2016-09-122-6/+20
| | | | | * | darwin: do not use objc_registerThreadWithCollector where deprecatedNathan Hjelm2016-09-072-2/+2
| | | | | * | darwin: work around devices with buggy endpoint descriptorsNathan Hjelm2016-09-072-8/+25
| | | | | * | release: on to 1.0.21-rc3Nathan Hjelm2016-08-213-3/+5
| | | | | * | core: Document why we drop the flying_transfers_lock before submit_transferHans de Goede2016-08-172-1/+5
| | | | | * | linux_usbfs: Deal with receiving POLLERR before all transfers have completedHans de Goede2016-08-172-4/+8
| | | | | * | core: Move calculate_timeout call to add_to_flying_transfersHans de Goede2016-08-171-8/+5
| | | | | * | core: Fix unlocked access to timeout_flagsHans de Goede2016-08-172-2/+9
| | | | | * | core: Fix do_close lockingHans de Goede2016-08-172-3/+3
| | | | | * | core: Test for LIBUSB_SUCCESS instead of 0 in handle_timeout()Hans de Goede2016-08-172-2/+2
| | | | | * | core: Do not arm timer-fd for transfers where the os handles timeoutHans de Goede2016-08-172-2/+2
| | | | | * | core: Refactor code related to transfer flags and timeout handlingChris Dickens2016-08-175-99/+104
| | | | | * | winnt: Do not differ between cancel / timeout ourselvesHans de Goede2016-08-172-10/+8
| | | | | * | wince: Do not differ between cancel / timeout ourselvesHans de Goede2016-08-172-8/+3
| | | | | * | core: Change event handling lock to traditional (non-recursive) typeChris Dickens2016-08-176-57/+34
| | | | | * | Revert "io: Fix race condition in handle_timeout()"Hans de Goede2016-08-172-38/+21
| | | | | * | on to 1.0.21-rc2Nathan Hjelm2016-07-242-2/+2
| | | | | * | Updated TODO linkAnil Nair2016-07-242-2/+2
| | | | | * | changelog: add entry for new solaris backendNathan Hjelm2016-07-242-1/+2
| | | | | * | Solaris backendLei Chen2016-07-248-4/+1401
| | | | | * | changelog: add missing entryNathan Hjelm2016-07-222-1/+2
| | | | | * | windows: use appropriate version for VS2015 solution filesPete Batard2016-07-222-3/+3
| | | | | * | libusb 1.0.21-rc1Nathan Hjelm2016-07-213-3/+12