summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 91dcd9888d ↵Joel Galenson
am: b340e65226 am: e1a246a985 am: 5793d68326 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1912689 Change-Id: I3b3b1af9f2b6074c479e176cc95ee19bd614d11d
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 91dcd9888d ↵Joel Galenson
am: b340e65226 am: e1a246a985 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1912689 Change-Id: I5f12898e0e630ebb29d239b685cd7779bd08de6e
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 91dcd9888d ↵Joel Galenson
am: b340e65226 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1912689 Change-Id: I529491ff85c84eafa2ef801531f678c1fca56559
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 91dcd9888dJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1912689 Change-Id: I137b8b140c81bcb2e8ed2260e448b6cb77ab5174
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING."android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Joel Galenson
2021-12-10Refresh Android.bp, cargo2android.json, TEST_MAPPING.Joel Galenson
Test: None Change-Id: Icb0d8a5ea9ff1b06b681657f23ec8031080d9de1
2021-10-12Merge "Upgrade rust/crates/thiserror-impl to 1.0.29" am: 9042e02c46 am: ↵Joel Galenson
b94155e333 am: 6f81fd4b00 am: 199b724b69 am: c7b776239d Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1833325 Change-Id: If1d462b95fe6aa61f206ffa6f7c513d27e32b11c
2021-10-12Merge "Upgrade rust/crates/thiserror-impl to 1.0.29" am: 9042e02c46 am: ↵Joel Galenson
b94155e333 am: 6f81fd4b00 am: 199b724b69 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1833325 Change-Id: I1f96abf8b9935ab6325525a3d36ba3a2c90b5afd
2021-10-12Merge "Upgrade rust/crates/thiserror-impl to 1.0.29" am: 9042e02c46 am: ↵Joel Galenson
b94155e333 am: 6f81fd4b00 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1833325 Change-Id: Ifb23af654537d906e817624d8173824b4129050b
2021-10-12Merge "Upgrade rust/crates/thiserror-impl to 1.0.29" am: 9042e02c46 am: ↵Joel Galenson
b94155e333 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1833325 Change-Id: I5e467f1d59c6622d5387dc0f40a955a3293181a0
2021-10-12Merge "Upgrade rust/crates/thiserror-impl to 1.0.29" am: 9042e02c46Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1833325 Change-Id: I76d3ae7f25e41f5c307c23b75e677b1d224af6af
2021-10-12Merge "Upgrade rust/crates/thiserror-impl to 1.0.29"android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Joel Galenson
2021-10-01Update TEST_MAPPING am: 05098c8a68 am: 5be5028e36 am: 823785ed21 am: ↵Joel Galenson
211307a0a1 am: 7d38e022bd Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1843534 Change-Id: I293b6bf1a2da8236ab63e244a531d73085027b1a
2021-10-01Update TEST_MAPPING am: 05098c8a68 am: 5be5028e36 am: 823785ed21 am: 211307a0a1Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1843534 Change-Id: I9d35970870f366cbe3d2d0fa87b2ad5f4d42786c
2021-10-01Update TEST_MAPPING am: 05098c8a68 am: 5be5028e36 am: 823785ed21Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1843534 Change-Id: I4c88d49e266c66d0620ddcb8d74cd94133691b45
2021-10-01Update TEST_MAPPING am: 05098c8a68 am: 5be5028e36Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1843534 Change-Id: Ieffd2025ca637e4b55b049adc181005037e89806
2021-10-01Update TEST_MAPPING am: 05098c8a68Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1843534 Change-Id: Id4ac750664b98232898050430e20a0f3819e5887
2021-10-01Update TEST_MAPPINGJoel Galenson
Test: None Change-Id: I7c8b20878250623f5803404ab5b49d81c65f3082
2021-09-22Upgrade rust/crates/thiserror-impl to 1.0.29Joel Galenson
Test: make Change-Id: I2acd58ed807b577d34c3e860e6eaec1912d8fc76
2021-08-24Update TEST_MAPPING am: 3173393ad4 am: 7151e04757 am: b42adc63e6 am: ↵Joel Galenson
c3a0c0897f am: 825f8f3e66 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1806105 Change-Id: Ib9d55fc42b4ba7391caca7a52e7bcba3c16eb96d
2021-08-24Update TEST_MAPPING am: 3173393ad4 am: 7151e04757 am: b42adc63e6 am: c3a0c0897fJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1806105 Change-Id: I344633060a3ee661141305fad00b534001e88cb1
2021-08-24Update TEST_MAPPING am: 3173393ad4 am: 7151e04757 am: b42adc63e6Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1806105 Change-Id: I917c8564753228bf25bac7ea44a0577ebb7f7889
2021-08-24Update TEST_MAPPING am: 3173393ad4 am: 7151e04757Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1806105 Change-Id: I2205cfac889e942a35c396fb7b3c2c75c6f285f9
2021-08-24Update TEST_MAPPING am: 3173393ad4Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1806105 Change-Id: I46931f216c05fa2d66d077b523edbb8f7559899a
2021-08-23Update TEST_MAPPINGandroid-s-beta-5android-s-beta-5Joel Galenson
Test: None Change-Id: Icc7658d832c841ddf7a02ecfee2321ecddc7d1d5
2021-08-10Upgrade rust/crates/thiserror-impl to 1.0.26 am: 87fb8e3f69 am: 9dc2b8cd8c ↵Joel Galenson
am: a396b3c5e6 am: 18dc0a0e9d am: 2b33e7b6ad Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1791039 Change-Id: I20622507cad1fa7eb9ab6918fad67f607f8f668f
2021-08-10Upgrade rust/crates/thiserror-impl to 1.0.26 am: 87fb8e3f69 am: 9dc2b8cd8c ↵Joel Galenson
am: a396b3c5e6 am: 18dc0a0e9d Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1791039 Change-Id: I139e736b59057daba85d9b3d772b69dcf6a27bd6
2021-08-10Upgrade rust/crates/thiserror-impl to 1.0.26 am: 87fb8e3f69 am: 9dc2b8cd8c ↵Joel Galenson
am: a396b3c5e6 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1791039 Change-Id: I283624cf77f67c5224db4929208f0634dadc27ff
2021-08-10Upgrade rust/crates/thiserror-impl to 1.0.26 am: 87fb8e3f69 am: 9dc2b8cd8cJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1791039 Change-Id: Ib39ffe873ab93c5d8df6c4218d85e9c0701dcc00
2021-08-10Upgrade rust/crates/thiserror-impl to 1.0.26 am: 87fb8e3f69Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1791039 Change-Id: Id0a76690ec9d501e04607749c8dabfb82ce8f3dd
2021-08-09Upgrade rust/crates/thiserror-impl to 1.0.26Joel Galenson
Test: make Change-Id: I4a3714da4edbd8ebb8551817573ef4ce827bab9a
2021-07-06Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPING am: ↵easoncylee
a852085282 am: dd911021f1 am: 238ff1d1f2 am: 10d474d3b7 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1755594 Change-Id: I4ebe80a127f4364e46aa6f5d9459826e8d3bf211
2021-07-06Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPING am: ↵easoncylee
a852085282 am: dd911021f1 am: 238ff1d1f2 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1755594 Change-Id: I8f424897cec2890dc15b3d2a3041833b192dc884
2021-07-06Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPING am: ↵easoncylee
a852085282 am: dd911021f1 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1755594 Change-Id: Ia480140e2fd0f3eb5c8d9cb46c17ee6eb02ae484
2021-07-06Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPING am: ↵easoncylee
a852085282 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1755594 Change-Id: Ibebdde34d199a84fea37c2d63b5b7d81072ae05c
2021-07-05Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPINGandroid-s-beta-4android-s-beta-3android-s-beta-4easoncylee
The test had been changed to legacykeystore_test from ag/14968529 Bug: 192796637 Test: presubmit Change-Id: I8e6158a06183dbbbd80be704fde3fe55e0d03996
2021-06-22Upgrade rust/crates/thiserror-impl to 1.0.25 am: 3c765a1c48 am: e730563c06 ↵Joel Galenson
am: 55badbb1a0 am: 68ff2466f0 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1742523 Change-Id: Ia652353cf0af6356775c0ed994ebc7ed9edae241
2021-06-22Upgrade rust/crates/thiserror-impl to 1.0.25 am: 3c765a1c48 am: e730563c06 ↵Joel Galenson
am: 55badbb1a0 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1742523 Change-Id: I9971089e829aaf40240dd0664485746c0fcee82c
2021-06-22Upgrade rust/crates/thiserror-impl to 1.0.25 am: 3c765a1c48 am: e730563c06Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1742523 Change-Id: Ie6e58f0aaea9606167226ee07016af78b605344f
2021-06-22Upgrade rust/crates/thiserror-impl to 1.0.25 am: 3c765a1c48Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1742523 Change-Id: I76458e241097ef8ecab2e813fa02e745787a1dfc
2021-06-21Upgrade rust/crates/thiserror-impl to 1.0.25Joel Galenson
Test: make Change-Id: I67e6b4726c45acaa8cf086dbbbb79e8f19acf768
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: Iabdfe5f7c6f99c2e00b2b87c169042de4e4318a1
2021-03-01[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/thiserror-impl am: ↵android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r97android-mainline-12.0.0_r96android-mainline-12.0.0_r95android-mainline-12.0.0_r94android-mainline-12.0.0_r93android-mainline-12.0.0_r92android-mainline-12.0.0_r91android-mainline-12.0.0_r90android-mainline-12.0.0_r9android-mainline-12.0.0_r89android-mainline-12.0.0_r88android-mainline-12.0.0_r87android-mainline-12.0.0_r86android-mainline-12.0.0_r85android-mainline-12.0.0_r84android-mainline-12.0.0_r83android-mainline-12.0.0_r82android-mainline-12.0.0_r81android-mainline-12.0.0_r80android-mainline-12.0.0_r8android-mainline-12.0.0_r79android-mainline-12.0.0_r78android-mainline-12.0.0_r77android-mainline-12.0.0_r76android-mainline-12.0.0_r75android-mainline-12.0.0_r74android-mainline-12.0.0_r73android-mainline-12.0.0_r72android-mainline-12.0.0_r71android-mainline-12.0.0_r70android-mainline-12.0.0_r7android-mainline-12.0.0_r69android-mainline-12.0.0_r68android-mainline-12.0.0_r67android-mainline-12.0.0_r66android-mainline-12.0.0_r65android-mainline-12.0.0_r64android-mainline-12.0.0_r63android-mainline-12.0.0_r62android-mainline-12.0.0_r61android-mainline-12.0.0_r60android-mainline-12.0.0_r6android-mainline-12.0.0_r59android-mainline-12.0.0_r58android-mainline-12.0.0_r57android-mainline-12.0.0_r56android-mainline-12.0.0_r53android-mainline-12.0.0_r52android-mainline-12.0.0_r51android-mainline-12.0.0_r50android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r48android-mainline-12.0.0_r47android-mainline-12.0.0_r46android-mainline-12.0.0_r45android-mainline-12.0.0_r44android-mainline-12.0.0_r43android-mainline-12.0.0_r42android-mainline-12.0.0_r41android-mainline-12.0.0_r40android-mainline-12.0.0_r39android-mainline-12.0.0_r38android-mainline-12.0.0_r37android-mainline-12.0.0_r35android-mainline-12.0.0_r34android-mainline-12.0.0_r33android-mainline-12.0.0_r32android-mainline-12.0.0_r31android-mainline-12.0.0_r30android-mainline-12.0.0_r3android-mainline-12.0.0_r29android-mainline-12.0.0_r28android-mainline-12.0.0_r27android-mainline-12.0.0_r26android-mainline-12.0.0_r25android-mainline-12.0.0_r24android-mainline-12.0.0_r23android-mainline-12.0.0_r22android-mainline-12.0.0_r21android-mainline-12.0.0_r20android-mainline-12.0.0_r2android-mainline-12.0.0_r19android-mainline-12.0.0_r18android-mainline-12.0.0_r17android-mainline-12.0.0_r16android-mainline-12.0.0_r15android-mainline-12.0.0_r14android-mainline-12.0.0_r13android-mainline-12.0.0_r126android-mainline-12.0.0_r125android-mainline-12.0.0_r124android-mainline-12.0.0_r123android-mainline-12.0.0_r122android-mainline-12.0.0_r121android-mainline-12.0.0_r120android-mainline-12.0.0_r12android-mainline-12.0.0_r119android-mainline-12.0.0_r118android-mainline-12.0.0_r117android-mainline-12.0.0_r116android-mainline-12.0.0_r115android-mainline-12.0.0_r114android-mainline-12.0.0_r113android-mainline-12.0.0_r110android-mainline-12.0.0_r11android-mainline-12.0.0_r109android-mainline-12.0.0_r108android-mainline-12.0.0_r107android-mainline-12.0.0_r106android-mainline-12.0.0_r105android-mainline-12.0.0_r104android-mainline-12.0.0_r103android-mainline-12.0.0_r102android-mainline-12.0.0_r101android-mainline-12.0.0_r100android-mainline-12.0.0_r10android-mainline-12.0.0_r1aml_wif_311811030aml_tz3_311312010aml_tet_311811050aml_sdk_311710000aml_pco_311011000aml_mpr_311911090aml_doc_310851020android12-mainline-wifi-releaseandroid12-mainline-tethering-releaseandroid12-mainline-statsd-releaseandroid12-mainline-sdkext-releaseandroid12-mainline-resolv-releaseandroid12-mainline-permission-releaseandroid12-mainline-neuralnetworks-releaseandroid12-mainline-networkstack-releaseandroid12-mainline-mediaprovider-releaseandroid12-mainline-media-swcodec-releaseandroid12-mainline-media-releaseandroid12-mainline-ipsec-releaseandroid12-mainline-extservices-releaseandroid12-mainline-documentsui-releaseandroid12-mainline-conscrypt-releaseandroid12-mainline-cellbroadcast-releaseandroid12-mainline-captiveportallogin-releaseandroid12-mainline-art-releaseandroid12-mainline-adbd-releaseBob Badour
bbe8513130 am: fcf0fc84ad am: ab16399034 am: 5cbe3fa60b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1609817 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I76241fc70d6bc72f1527b0f23c2f8d09805e2dde
2021-03-01[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/thiserror-impl am: ↵Bob Badour
bbe8513130 am: fcf0fc84ad am: ab16399034 am: 5cbe3fa60b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1609817 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ife0d7401c3a7475b3663fdb389e3d67fa2e1e6a2
2021-03-01[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/thiserror-impl am: ↵android-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-releaseBob Badour
bbe8513130 am: fcf0fc84ad am: ab16399034 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1609817 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I24c6b0475c156d701b2e8945aed7f0fbc5a392fc
2021-03-01[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/thiserror-impl am: ↵Bob Badour
bbe8513130 am: fcf0fc84ad Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1609817 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0332ec78da548a137d6939502cc830246f143748
2021-03-01[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/thiserror-impl am: ↵android-s-beta-2android-s-beta-1Bob Badour
bbe8513130 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/thiserror-impl/+/1609817 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I9fafb58cff077aa071f9726a49a517c44e846ab3
2021-02-26[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/thiserror-implBob Badour
Added SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-MIT to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I2c24a530dc42753a7d59227aec915d047aae6f21
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: cfd6b0e9b6 -s ↵Xin Li
ours am: e56557cc89 -s ours am: bb8c0cee8d -s ours am skip reason: Change-Id Idd7baf6bdb5337d2a4ea8099ff15f395047929f1 with SHA-1 9382cdc33e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I772e466a2acdd40e844135e67c3a9ed05c64d319
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: cfd6b0e9b6 -s ↵Xin Li
ours am: e56557cc89 -s ours am: bb8c0cee8d -s ours am skip reason: Change-Id Idd7baf6bdb5337d2a4ea8099ff15f395047929f1 with SHA-1 9382cdc33e is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4245c9b016d21c083824aec03a3586e23a128c47