aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-06-02Merge sc-mainline-prodt_frc_tz4_330443010t_frc_swc_330443040t_frc_swc_330443010t_frc_sta_330443010t_frc_sch_330443040t_frc_sch_330443010t_frc_res_330443000t_frc_per_330444010t_frc_odp_330442040t_frc_odp_330442000t_frc_neu_330443030t_frc_neu_330443000t_frc_net_330443000t_frc_med_330443030t_frc_ips_330443010t_frc_ext_330443000t_frc_doc_330543000t_frc_doc_330443060t_frc_doc_330443000t_frc_con_330443020t_frc_cbr_330443000t_frc_ase_330444010t_frc_art_330443060t_frc_adb_330444000android-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_r55android-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_r32android-13.0.0_r30android-13.0.0_r29android-13.0.0_r28android-13.0.0_r27android-13.0.0_r24android-13.0.0_r23android-13.0.0_r22android-13.0.0_r21android-13.0.0_r20android-13.0.0_r19android-13.0.0_r18android-13.0.0_r17android-13.0.0_r16aml_uwb_331910010aml_uwb_331820070aml_uwb_331613010aml_uwb_331611010aml_uwb_331410010aml_uwb_331310030aml_uwb_331115000aml_uwb_331015040aml_uwb_330810010aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000aml_go_wif_330911000aml_go_uwb_330912000aml_go_tz4_330912000aml_go_tet_330914010aml_go_swc_330913000aml_go_sta_330911000aml_go_sdk_330810000aml_go_sch_330911000aml_go_res_330912000aml_go_per_330912000aml_go_odp_330913000aml_go_odp_330912000aml_go_neu_330912000aml_go_net_330913000aml_go_mpr_330912000aml_go_med_330913000aml_go_ips_330911000aml_go_ext_330912000aml_go_doc_330912000aml_go_con_330913000aml_go_cbr_330912000aml_go_ase_330913000aml_go_art_330913000aml_go_ads_330915100aml_go_ads_330915000aml_go_ads_330913000aml_go_adb_330913000aml_ase_331311020aml_ase_331112000aml_ase_331011020aml_ads_331920180aml_ads_331814200aml_ads_331710270aml_ads_331611190aml_ads_331511020aml_ads_331418080aml_ads_331131000android13-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-qpr1-s8-releaseandroid13-qpr1-s7-releaseandroid13-qpr1-s6-releaseandroid13-qpr1-s5-releaseandroid13-qpr1-s4-releaseandroid13-qpr1-s3-releaseandroid13-qpr1-s2-releaseandroid13-qpr1-s1-releaseandroid13-qpr1-releaseandroid13-mainline-uwb-releaseandroid13-mainline-tzdata4-releaseandroid13-mainline-go-wifi-releaseandroid13-mainline-go-uwb-releaseandroid13-mainline-go-tzdata4-releaseandroid13-mainline-go-tethering-releaseandroid13-mainline-go-sdkext-releaseandroid13-mainline-go-scheduling-releaseandroid13-mainline-go-resolv-releaseandroid13-mainline-go-permission-releaseandroid13-mainline-go-os-statsd-releaseandroid13-mainline-go-odp-releaseandroid13-mainline-go-neuralnetworks-releaseandroid13-mainline-go-networking-releaseandroid13-mainline-go-mediaprovider-releaseandroid13-mainline-go-media-swcodec-releaseandroid13-mainline-go-media-releaseandroid13-mainline-go-ipsec-releaseandroid13-mainline-go-extservices-releaseandroid13-mainline-go-documentsui-releaseandroid13-mainline-go-conscrypt-releaseandroid13-mainline-go-cellbroadcast-releaseandroid13-mainline-go-art-releaseandroid13-mainline-go-appsearch-releaseandroid13-mainline-go-adservices-releaseandroid13-mainline-go-adbd-releaseandroid13-mainline-appsearch-releaseandroid13-mainline-adservices-releaseandroid13-frc-scheduling-releaseandroid13-frc-resolv-releaseandroid13-frc-permission-releaseandroid13-frc-os-statsd-releaseandroid13-frc-odp-releaseandroid13-frc-neuralnetworks-releaseandroid13-frc-networking-releaseandroid13-frc-media-swcodec-releaseandroid13-frc-media-releaseandroid13-frc-ipsec-releaseandroid13-frc-extservices-releaseandroid13-frc-documentsui-releaseandroid13-frc-conscrypt-releaseandroid13-frc-cellbroadcast-releaseandroid13-frc-art-releaseandroid13-frc-adbd-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseandroid13-d2-releaseaml_tz4_332714010Xin Li
Bug: 189946434 Change-Id: I61485c1cd7cdc15753a46332c817b9de5af16280
2021-05-29[LSC] Add LOCAL_LICENSE_KINDS to external/python/asn1crypto am: 5ecfceb239 ↵Bob Badour
am: e642161d90 am: 9b7011a50b am: 0f8a28548a am: 3bb297fd3a Original change: https://android-review.googlesource.com/c/platform/external/python/asn1crypto/+/1588609 Change-Id: Ia0d97e08250752d7af4d0690839dd47fb66f7deb
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8522b1348b -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: 11a23cee80 -s ours am: 712c1b4a72 -s ours am skip reason: Change-Id Ic5cd9ab9a0f2630521d1bd321335b070c1188d6b with SHA-1 f954c3825e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I38650df249f812951f902fce51c573873a42b69e
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8522b1348b -s ↵Xin Li
ours am: 11a23cee80 -s ours am: 712c1b4a72 -s ours am skip reason: Change-Id Ic5cd9ab9a0f2630521d1bd321335b070c1188d6b with SHA-1 f954c3825e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I973e57ee41170be4e72c6e13796e50a68d6476a6
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8522b1348b -s ↵android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-3android-s-v2-beta-2android-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: 11a23cee80 -s ours am skip reason: Change-Id Ic5cd9ab9a0f2630521d1bd321335b070c1188d6b with SHA-1 f954c3825e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifc79f999cf7d570d40348b2f751d1b781a3b7214
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 8522b1348b -s oursXin Li
am skip reason: Change-Id Ic5cd9ab9a0f2630521d1bd321335b070c1188d6b with SHA-1 f954c3825e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If2324e6e0e30b3ebad92e0bb32cc91a06bcb1cd6
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: Ic5cd9ab9a0f2630521d1bd321335b070c1188d6b Change-Id: I15759d68f661867690c4f858a31ab370c2ed20bb
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/python/asn1crypto am: 5ecfceb239 ↵Bob Badour
am: e642161d90 am: 9b7011a50b am: 0f8a28548a Original change: https://android-review.googlesource.com/c/platform/external/python/asn1crypto/+/1588609 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia948ae7741f4c3af59c30b66ac0d16d145a8c1cd
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/python/asn1crypto am: 5ecfceb239 ↵Bob Badour
am: e642161d90 am: 9b7011a50b am: 0f8a28548a Original change: https://android-review.googlesource.com/c/platform/external/python/asn1crypto/+/1588609 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib8485a4da3f48334c54132dd6e4712f237cda21d
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/python/asn1crypto am: 5ecfceb239 ↵Bob Badour
am: e642161d90 am: 9b7011a50b Original change: https://android-review.googlesource.com/c/platform/external/python/asn1crypto/+/1588609 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie1701226d2b687ae2e8a703f4186178993652206
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/python/asn1crypto am: 5ecfceb239 ↵Bob Badour
am: e642161d90 Original change: https://android-review.googlesource.com/c/platform/external/python/asn1crypto/+/1588609 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id9dff0f96824438e27db24d58d31d112df4efad6
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/python/asn1crypto am: 5ecfceb239Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/python/asn1crypto/+/1588609 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I76ead2f02569f30c0fdf111f11262ca2187b37ab
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/python/asn1cryptoandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-MIT to: Android.bp asn1crypto/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Ie246bed6727ab34428a782b6d8bc08825d965150
2021-01-14Remove test mapping file for acloud_test am: 5c9e929239 am: 2349290c14 am: ↵Julien Desprez
211aa17744 Original change: https://android-review.googlesource.com/c/platform/external/python/asn1crypto/+/1550215 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0a1515d7965737196b062f823330b1a7fc9337cb
2021-01-13Remove test mapping file for acloud_test am: 5c9e929239 am: 2349290c14Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/python/asn1crypto/+/1550215 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4a8cc783f0794e1530f40bf7eba082de082debe1
2021-01-13Remove test mapping file for acloud_test am: 5c9e929239Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/python/asn1crypto/+/1550215 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ibc11761684fc10a556a5dc745f9f5921471a6d14
2021-01-13Remove test mapping file for acloud_testJulien Desprez
Not needed anymore. Test: presubmit Bug: 175408655 Change-Id: Icbe0496728088e962266633985b770cae5236310
2020-11-24Mark ab/6881855 as merged am: d4f48b9f87 am: f954c3825eXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/asn1crypto/+/13109962 Change-Id: Ibb5e9f98827648216c0b31d91a7884bfa58b27f3
2020-11-24Mark ab/6881855 as merged am: d4f48b9f87Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/python/asn1crypto/+/13109962 Change-Id: Ic5cd9ab9a0f2630521d1bd321335b070c1188d6b
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Id713f4b80465d0fe3efbaf28edd3b1dfc52ffc02
2020-10-29Upgrade python/asn1crypto to 1.4.0 am: 2b20719855 am: 47da9b5dc5 am: ↵Haibo Huang
84d95d24f2 am: b92eb88d32 Original change: https://android-review.googlesource.com/c/platform/external/python/asn1crypto/+/1479353 Change-Id: I5f64894cf60d21f316b6d1411c66794fede0fdf6
2020-10-29Upgrade python/asn1crypto to 1.4.0 am: 2b20719855 am: 47da9b5dc5 am: 84d95d24f2Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/python/asn1crypto/+/1479353 Change-Id: I0d5ecbce13fe6394a033abed5ca26ac2a044d61e
2020-10-29Upgrade python/asn1crypto to 1.4.0 am: 2b20719855 am: 47da9b5dc5Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/python/asn1crypto/+/1479353 Change-Id: Icc21f5cb3d1f128b2ee4e79bed2f210ee464264a
2020-10-29Upgrade python/asn1crypto to 1.4.0 am: 2b20719855Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/python/asn1crypto/+/1479353 Change-Id: I309a3a8a3800f68b97a9b15902bfce6857bf2270
2020-10-28Upgrade python/asn1crypto to 1.4.0Haibo Huang
Test: make Change-Id: I91c1d9e084d4804e09aa5d686816dba41512357e
2020-07-28Version 1.4.0wbond
2020-07-25Fix keys.PublicKeyInfo.bit_size tests on Python 2.6wbond
2020-07-25Ensure keys.PublicKeyInfo.bit_size returns an intwbond
2020-07-25Tweak error messages on invalid OIDswbond
2020-07-25Merge pull request #174 from joernheissler/oid-arc-2Will Bond
Fix parsing of ObjectIdentifier's first octet.
2020-07-21Fix PyPy on CircleCIwbond
2020-07-21Merge pull request #188 from daxtens/travis-ppc64leWill Bond
Add ppc64le jobs to Travis CI
2020-07-20Add ppc64le jobs to Travis CIDaniel Axtens
As with ARM64, Travis CI supports ppc64le ("Power") now. I've just mimicked the job that ARM64 does, I think that provides decent coverage without bloating the test matrix too much. (We could also test pypy on Power, but I don't think it gets us too much extra value.)
2020-05-21Disable uploading coverage reports to codecov since it is a constant thorn ↵wbond
in my side
2020-05-21Fix an issue with asn1crypto_tests when running egg_info from sdistwbond
2020-05-04Merge pull request #181 from hroncok/patch-1Jörn Heissler
Fix a syntax typo
2020-05-04Fix a syntax typoMiro Hrončok
This worked for now, but is SyntaxError in Python 3.9.0a6: File "/usr/lib/python3.9/site-packages/asn1crypto/x509.py", line 1139 return', '.join( ^ SyntaxError: invalid string prefix (The Python change might actually be reverted before 3.9 final, but this can be fixed anyway.)
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: e601bdffcf -s ours am: d1a106cb67 am: dca49b83ca am: 4cd1b10a3f -s ours am skip reason: subject contains skip directive Change-Id: I5ba4c1ca3036f9c237f784eed1ff0cfa93ccd680
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: e601bdffcf -s ours am: d1a106cb67 am: dca49b83ca Change-Id: I696add7171c820867aa8254ca423191b95c3f8f2
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: e601bdffcf -s ours am: d1a106cb67 Change-Id: I14df755a99bb97c940ade44583384d1e47b40db0
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: e601bdffcf -s ours am skip reason: subject contains skip directive Change-Id: I124a3fd0579b628566cb5d9339ee87883e6c08bc
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterandroid-r-beta-3android-r-beta-2Xin Li
Bug: 151763422 Change-Id: I7a9189e190b589aef49dd65485887ed33ed8fdc5
2020-03-26Remove redundant NOTICE symbolic link. am: 39d4669413 am: 9d6b0848b4 am: ↵Bob Badour
2993ae972d am: 820d6fd3d6 am: 5d917ee920 Change-Id: Iffcdd8dbe1026bac2802fa726ce286b587c0d2c5
2020-03-26Remove redundant NOTICE symbolic link. am: 39d4669413 am: 9d6b0848b4 am: ↵Bob Badour
2993ae972d am: 820d6fd3d6 Change-Id: I048d2fe6122320db24f9cab45ea5da698c5c28ab
2020-03-26Remove redundant NOTICE symbolic link. am: 39d4669413 am: 9d6b0848b4 am: ↵Bob Badour
2993ae972d Change-Id: I9bb9ab295bd5a2ff464e236edeb66a98df803e10
2020-03-26Remove redundant NOTICE symbolic link. am: 39d4669413 am: 9d6b0848b4Bob Badour
Change-Id: Ibae7d220e104f1360c1ad0ad1a6c35bb4d0b0145
2020-03-26Remove redundant NOTICE symbolic link. am: 39d4669413 am: 9d6b0848b4Bob Badour
Change-Id: If9a41a8c81ad30179b0f05d6ac1d6ff2f5951977
2020-03-26Remove redundant NOTICE symbolic link. am: 39d4669413Bob Badour
Change-Id: I71060cfda663693fdef6da201602419f41fd2072
2020-03-25Remove redundant NOTICE symbolic link.Bob Badour
Now that http://aosp/1235427 and http://aosp/1238719 are in, NOTICE symbolic links are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: I7e80d02c22c978ada7371407eb6ed4ae58ea4108
2020-02-18Run GitHub actions on pull requestswbond