aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-21Snap for 7478067 from 42e2a0711186eebb77d2a273660381931e8e0c16 to ↵android-mainline-12.0.0_r9android-mainline-12.0.0_r87android-mainline-12.0.0_r72android-mainline-12.0.0_r44android-mainline-12.0.0_r27android-mainline-12.0.0_r117android-mainline-12.0.0_r102android12-mainline-extservices-releaseandroid-build-team Robot
mainline-extservices-release Change-Id: I3fcf0f7752e58eeb09db1b90e62f8f820311d374
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 442ee40ed7 -s ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseXin Li
ours am: c3e5a2c4b1 -s ours am: 7380ba9a76 -s ours am skip reason: Change-Id Ibde80548980d6eaed9ca95accaabf7fcf1c4860d with SHA-1 2a5a93fdfd is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibe7bbda11f12c1973b69e76b88c8edb967fd77fa
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 442ee40ed7 -s ↵android-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-12.0.0_r32android-12.0.0_r29android-12.0.0_r28android-12.0.0_r27android-12.0.0_r26android-12.0.0_r21android-12.0.0_r20android-12.0.0_r19android-12.0.0_r18android-12.0.0_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-t-preview-1android-s-v2-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Xin Li
ours am: c3e5a2c4b1 -s ours am skip reason: Change-Id Ibde80548980d6eaed9ca95accaabf7fcf1c4860d with SHA-1 2a5a93fdfd is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie2842262e956ee039a462cac8280848d70715562
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 442ee40ed7 -s oursXin Li
am skip reason: Change-Id Ibde80548980d6eaed9ca95accaabf7fcf1c4860d with SHA-1 2a5a93fdfd is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic02f01830b6b41e96f14026a20d7cfb8eec0ef86
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Xin Li
Bug: 180401296 Merged-In: Ibde80548980d6eaed9ca95accaabf7fcf1c4860d Change-Id: I0b2219b15f518c384dc45f37aa32f32913ec4b4f
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libusb" am: f4e56d84e0 am: ↵Bob Badour
be2f3e44e2 am: 8f17adeb23 am: 18fed8206a Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/1588629 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I85637e9ee010473e6e43bfb40c209869691d8369
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libusb" am: f4e56d84e0 am: ↵Bob Badour
be2f3e44e2 am: 8f17adeb23 Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/1588629 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iee9e258b30659eb9f8c75c056d5c3e98b9fe6991
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libusb" am: f4e56d84e0 am: ↵Bob Badour
be2f3e44e2 Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/1588629 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iae96705e34f2fccba1e93dfde60ca22c5f0d26d8
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libusb" am: f4e56d84e0Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/1588629 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If607e0926e9dc294e528a3798852089d67ecdd19
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libusb"Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/libusbBob Badour
Added SPDX-license-identifier-GPL SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 SPDX-license-identifier-MIT to: Android.bp Added SPDX-license-identifier-LGPL SPDX-license-identifier-LGPL-2.1 SPDX-license-identifier-LGPL-3.0 to: android/jni/examples.mk android/jni/libusb.mk android/jni/tests.mk Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I83e2ada5cc458204d8758e5772fb561a8675e2d3
2021-01-23Merge "Silence -Wunguarded-availability" am: 8d7f7f4bdc am: 20f229f2a7 am: ↵Roland Levillain
8dbdfc669e Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/1556459 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ieaecf383ca63bf2a4ae0c16bf2361117743da32a
2021-01-23Merge "Silence -Wunguarded-availability" am: 8d7f7f4bdc am: 20f229f2a7Roland Levillain
Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/1556459 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I99665aa7147fad84f01a3d904377e8011069dbfb
2021-01-23Merge "Silence -Wunguarded-availability" am: 8d7f7f4bdcRoland Levillain
Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/1556459 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1f2fca73a52206685ef08f54915db194e88f73ec
2021-01-23Merge "Silence -Wunguarded-availability"Roland Levillain
2021-01-22Merge "Update OWNERS." am: 77521a64e0 am: 50542271c4 am: 29b66e4b89Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/1556942 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1b9bdbba21bd5c6faba899e8ad65fb3360d168aa
2021-01-22Merge "Update OWNERS." am: 77521a64e0 am: 50542271c4Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/1556942 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I869202d65952522deb17f7879d943423c4826cf1
2021-01-22Merge "Update OWNERS." am: 77521a64e0Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/1556942 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I22472943ba4e9138f5851bc2d4f3f593af283413
2021-01-22Merge "Update OWNERS."Elliott Hughes
2021-01-22Update OWNERS.Elliott Hughes
adb has moved, and it probably makes more sense to just assign this to all the janitors anyway. (We should probably add a TEST_MAPPING here, but that's a separate issue.) Test: N/A Change-Id: I23819b7ae3b11e814fcb3c99c805065cd57266a6
2021-01-22Silence -Wunguarded-availabilityJiyong Park
The build system recently started to use `-Wunguarded-availability` and is complaining that the calls to clock_gettime isn't properly guarded with the runtime __builtin_availability check. However, the call is already statically guarded by HAVE_CLOCK_GETTIME. Silence the unguarded availability check. Bug: 178124881 Test: watch a forrest run on mac Change-Id: I0715091620ce1a5346f21c3484f4714d760bea61
2020-12-16Merge "Upgrade libusb to v1.0.24" am: e128647bb7 am: 9beb485342 am: 2a5a93fdfdElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/1525678 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I67793b83da48d661ae9eb038fa54de66dc58773b
2020-12-16Merge "Upgrade libusb to v1.0.24" am: e128647bb7 am: 9beb485342Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/1525678 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibde80548980d6eaed9ca95accaabf7fcf1c4860d
2020-12-16Merge "Upgrade libusb to v1.0.24" am: e128647bb7Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/1525678 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3c10eb6d31ed200d9bffb1f16048ad17f508d582
2020-12-16Merge "Upgrade libusb to v1.0.24"Elliott Hughes
2020-12-14Upgrade libusb to v1.0.24Haibo Huang
With manual updates to Android.bp and the (darwin linux windows)/config.h files. Test: treehugger Change-Id: Ie7538ff6b1e3e08fbdca1fe4d40deca6d0656539
2020-12-10libusb 1.0.24Chris Dickens
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
2020-12-03autotools: fix out-of-tree building of documentationAurelien Jarno
When building libusb out-of-tree, ie when running configure from another directory, building the documentation fails with: $ make -C doc make: Entering directory '/tmp/build/doc' make: *** No rule to make target 'libusb.png', needed by 'api-1.0'. Stop. make: Leaving directory '/tmp/build/doc' This has likely been broken by commit 4a5540a925e4 ("autotools: Fix a number of issues"). This patch fixes that by prefixing libusb.png with @top_srcdir@/doc. Signed-off-by: Aurelien Jarno <aurelien@aurel32.net>
2020-11-30fix eol of msvc/*.vcxproj and msvc/*.vcxproj.filters filesMikolaj Kucharski
Closes #812 Closes #813 Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
2020-11-27libusb 1.0.24-rc1Chris Dickens
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
2020-11-27Windows: Fix a few more benign compiler warningsChris Dickens
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
2020-11-27Windows: Support building dpfp and sam3u_benchmark with MSVCChris Dickens
Closes #151 Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
2020-11-27Windows: Add missing header files to MSVC projectsChris Dickens
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
2020-11-27build: Prepare config.h for inclusion in examples/testsChris Dickens
There are certain games played in the examples and tests source to account for differences in build environments and target platforms. This can be simplified by including config.h and using the definitions there. To that end, move the printf function attribute definition from libusbi.h to config.h and leverage it where it is used in the examples and tests. Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
2020-11-24Mark ab/6881855 as merged am: 1c5621e417 am: c7dbeb86e5Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libusb/+/13112782 Change-Id: I74a631a2d9496a0f63dcfb3a3414b06233e2e1d7
2020-11-24Mark ab/6881855 as merged am: 1c5621e417Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libusb/+/13112782 Change-Id: I3d472e74d9d1040554f9f35f177e70e88bfc5a92
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ic64f241c15715b3327b3467012cf3301f92b50c8
2020-11-16build: Fix Android and Xcode compilation errors/warningsChris Dickens
Commit f69548c3b3 ("examples: Enable all examples to build on all platforms") modified dpfp and sam3u_benchmark to be buildable on any platform, however there were some oversights and regressions introduced for Android and Xcode. Update the Android and Xcode build files to account for the removal of dpfp_threaded.c as well as the inclusion of config.h from examples and/or tests source. Additionally switch the threaded version of dpfp to use sem_open() instead of sem_init() as the latter is in fact deprecated on MacOS. Closes #808 Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
2020-11-10examples: Enable all examples to build on all platformsChris Dickens
Prior to this change, the dpfp and sam3u_benchmark examples were only built on POSIX platforms due to a dependency on sigaction(). Furthermore the dpfp_threaded example only worked with POSIX threads. Lift this limitation by breaking the dependence on sigaction(). Also provide a minimal threading abstraction so that dpfp_threaded can be built on Windows as well. Also merge the sources for dpfp and dpfp_threaded. The only difference between the two is how libusb's event handling functions are called and this can be easily handled within a single source file. Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
2020-11-09Windows: ignore all broken devices during enumerationIhor Dutchak
- explicitly check/log info, when a device has broken descriptor; Closes #791 Closes #806 Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
2020-11-09Fix various CI build warningsChris Dickens
* [-Wpointer-arith] arithmetic on a pointer to void is a GNU extension * [-Wswitch-enum] enumeration values 'E1, ...' not explicitly handled in switch * [-Wunused-parameter] unused parameter 'p' For '-Wswitch-enum', the switch statements in the individual backends' set_option() function has been removed. It is not expected that backends will need to handle or be aware of all the options. Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
2020-11-09travis: Update build environmentsChris Dickens
Add Ubuntu's Focal distribution to get the latest Linux toolchain. Add Xcode 12.2 to get the latest MacOS toolchain. Remove Xcode 7.3 as it is now obsolete and will not successfully build. Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
2020-11-07tests: Refactor testlib to simplify and fix Cygwin buildChris Dickens
Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
2020-11-07libusb.h: Base Class EFh (Miscellaneous) was missing in class definition.Uwe Bonnes
Closes #802 Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
2020-10-20Windows: Restrict path for dynamic library loadingChris Dickens
The LoadLibraryA() function performs a search through various paths when provided a library name that does not include a path element. All of the libraries that libusb needs to dynamically load are installed in the Windows system directory, thus it is not necessary to search any paths. To harden the security of libusb and prevent loading libraries from outside of the system directory should an attacker be able to alter the environment or place an identically named library somewhere in the search paths that occur before the Windows system directory, introduce a function that calls LoadLibraryA() with a full path to the requested library witin the Windows system directory. Note that we cannot call SetDllDirectoryA() because as a library we should not alter the DLL search path of the application. We also cannot use LoadLibraryExA() with the LOAD_LIBRARY_SEARCH_* flags because those flags require a specific security update to be installed on Vista and 7. Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
2020-10-15core: Iterate over completed transfers using the correct list nodeChris Dickens
Commit 006ca0fbaa ("Guard against getting stuck while handling events") caused a regression using the wrong list node when iterating a list. Fix this by introducing and using an alternate for_each iterator. Closes #796 Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
2020-10-15core: Fix the newly added list_splice_front() functionChris Dickens
One statement was missing to preserve the consistency of the list. Signed-off-by: Chris Dickens <christopher.a.dickens@gmail.com>
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 1af86e8829 -s ours am: ↵Xin Li
b0d1d5af08 -s ours am: bdb1162661 -s ours am skip reason: Change-Id I31f43dcaeda37b9697b0e428e885fc407f3bc3d0 with SHA-1 ca8cc49ebd is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libusb/+/12796973 Change-Id: I5791a37cb9be9112d37205bd3685af416eeb1d3f
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 1af86e8829 -s ours am: ↵Xin Li
b0d1d5af08 -s ours am skip reason: Change-Id I31f43dcaeda37b9697b0e428e885fc407f3bc3d0 with SHA-1 ca8cc49ebd is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libusb/+/12796973 Change-Id: If15f85bd9445a57ed0f2872d243a0645092f3a57
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 1af86e8829 -s oursXin Li
am skip reason: Change-Id I31f43dcaeda37b9697b0e428e885fc407f3bc3d0 with SHA-1 ca8cc49ebd is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/libusb/+/12796973 Change-Id: Ib690df511ac04c57403fee33eb615a02f5428ce3
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-25 08:32:39 +0000