aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-03-17Snap for 8310722 from 5304cf842bc939bf265e66def73bb62e7f93526e to tm-releaseandroid-vts-13.0_r8android-vts-13.0_r7android-vts-13.0_r6android-vts-13.0_r5android-vts-13.0_r4android-vts-13.0_r3android-vts-13.0_r2android-vts-13.0_r1android-t-beta-4-gplandroid-t-beta-3.2-gplandroid-t-beta-3android-security-13.0.0_r9android-security-13.0.0_r8android-security-13.0.0_r7android-security-13.0.0_r6android-security-13.0.0_r5android-security-13.0.0_r4android-security-13.0.0_r3android-security-13.0.0_r2android-security-13.0.0_r18android-security-13.0.0_r17android-security-13.0.0_r16android-security-13.0.0_r15android-security-13.0.0_r14android-security-13.0.0_r13android-security-13.0.0_r12android-security-13.0.0_r11android-security-13.0.0_r10android-security-13.0.0_r1android-platform-13.0.0_r2android-platform-13.0.0_r1android-cts-13.0_r8android-cts-13.0_r7android-cts-13.0_r6android-cts-13.0_r5android-cts-13.0_r4android-cts-13.0_r3android-cts-13.0_r2android-cts-13.0_r1android-13.0.0_r8android-13.0.0_r7android-13.0.0_r6android-13.0.0_r5android-13.0.0_r4android-13.0.0_r31android-13.0.0_r3android-13.0.0_r2android-13.0.0_r12android-13.0.0_r1android13-tests-releaseandroid13-security-releaseandroid13-s3-releaseandroid13-s2-releaseandroid13-s1-releaseandroid13-releaseandroid13-gsiAndroid Build Coastguard Worker
Change-Id: Idf9af953bd54510ac27be3f26c482915c0a202fb
2022-03-15Merge "Tweak linux_glibc properties for musl builds in external/libusb" am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-t-qpr3-beta-3-gplandroid-t-qpr3-beta-1-gplandroid-t-qpr2-beta-3-gplandroid-t-qpr2-beta-2-gplandroid-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32aml_go_odp_330912000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-mainline-go-adservices-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseColin Cross
596772ba2a am: 87c8958af7 am: 499ca85135 Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/2018607 Change-Id: Id68d6afa6caf43c780522ffc601ed9177a6feffd
2022-03-15Merge "Tweak linux_glibc properties for musl builds in external/libusb" am: ↵Colin Cross
596772ba2a am: 87c8958af7 Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/2018607 Change-Id: I0b12f29b01fc1b633b337944c36bbcdcf62f57d7
2022-03-15Merge "Tweak linux_glibc properties for musl builds in external/libusb" am: ↵Colin Cross
596772ba2a Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/2018607 Change-Id: I2a3fc5291eccc81317fa6486987d2339142476af
2022-03-15Merge "Tweak linux_glibc properties for musl builds in external/libusb"Colin Cross
2022-03-08Tweak linux_glibc properties for musl builds in external/libusbColin Cross
For convenience, builds against musl libc currently use the linux_glibc properties because they are almost always linux-specific and not glibc-specific. In preparation for removing this hack, tweak the linux_glibc properties by either moving them to host_linux, which will apply to linux_glibc, linux_musl and linux_bionic, or by setting appropriate musl or linux_musl properties. Properties that must not be repeated while musl uses linux_musl and also still uses the linux_glibc properties are moved to glibc properties, which don't apply to musl. Whether these stay as glibc properties or get moved back to linux_glibc later once the musl hack is removed is TBD. Bug: 223257095 Test: m checkbuild Test: m USE_HOST_MUSL=true host-native Change-Id: Ifc78a0294bd34146aa352064e071c8a7e0322e42
2021-06-03Snap for 7418644 from 895f7d43b4858db961083cbbf783b9f4378586e5 to tm-releaseandroid-t-preview-2android-build-team Robot
Change-Id: I099f48dbca4d0a01177644f09012a719f1af85ff
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Ia8aad2e238a8e17a9c5882db0de6e67d7d34da9f
2021-05-30Snap for 7409432 from 0d86bbeaac6050a5a6bb08f49ab460c191d78518 to tm-releaseandroid-build-team Robot
Change-Id: I160d2b659e6e7f10f1681d9860897a29da8f59b0
2021-05-29Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/libusb" am: f4e56d84e0 am: ↵Bob Badour
be2f3e44e2 am: 8f17adeb23 am: 18fed8206a am: e18b55943e Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/1588629 Change-Id: Ib4571bf2aeb7c8a948b090d5f36e09b39c1abafa
2021-02-21Snap for 7160100 from d41a97888254935a3ce52c611d2dfad81ef0596a to tm-releaseandroid-build-team Robot
Change-Id: I2f8c18422520e0113e7b6e1a52f1bfcb2a80f5fb
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 442ee40ed7 -s ↵Xin 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: If76b93c3b1309b4542e481daed9ade26ef2d56c5
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-18Snap for 7151881 from 3df3306e3889ae871f5c6e8a039f0ea04eee5991 to tm-releaseandroid-build-team Robot
Change-Id: I06ebfe6be9702345fd3e6e9c26b5b5b019aa2d9a
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 am: 18fed8206a Original change: https://android-review.googlesource.com/c/platform/external/libusb/+/1588629 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7e860f6ee7d8a227bc4a9317b9ec32d4396b6917
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-25Snap for 7100739 from c18155af3103cc2b158bca848200b4a08ef7c9aa to tm-releaseandroid-build-team Robot
Change-Id: I24894003fc9542bdd1f2ff48710a2ed24e24848b
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
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-08 20:54:55 +0000