aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 699150cfbe ↵Joel Galenson
am: aaffa4289e am: c163e91d61 am: 8b7bbeb7d0 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1912681 Change-Id: I91c962bf0785c67de9abb13cf063bfb5724f4e49
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 699150cfbe ↵Joel Galenson
am: aaffa4289e am: c163e91d61 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1912681 Change-Id: Ief6ba7fb370a679491bf80f368957fc75c8809fd
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 699150cfbe ↵Joel Galenson
am: aaffa4289e Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1912681 Change-Id: I0ca83ac2db212887cdf52217de7afebe873cfca6
2021-12-15Merge "Refresh Android.bp, cargo2android.json, TEST_MAPPING." am: 699150cfbeJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1912681 Change-Id: I051c2a30293a00defd60814a432c51bae1ef7fe5
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: Idb52adf9c5c0840b2a24a0386fbf2a538fc8e05f
2021-10-05Merge "Upgrade rust/crates/proc-macro2 to 1.0.29" am: 8129d0cb0c am: ↵Stephen Hines
f2619ed659 am: 9c9387fa41 am: 22688df941 am: 100dd8f647 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1833322 Change-Id: Ifa2dd9016303e80297591420adc2528b6f3b1ee8
2021-10-05Merge "Upgrade rust/crates/proc-macro2 to 1.0.29" am: 8129d0cb0c am: ↵Stephen Hines
f2619ed659 am: 9c9387fa41 am: 22688df941 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1833322 Change-Id: I17d8ef192f73e5d124e8060c8c0c314f46e6aa3c
2021-10-05Merge "Upgrade rust/crates/proc-macro2 to 1.0.29" am: 8129d0cb0c am: ↵Stephen Hines
f2619ed659 am: 9c9387fa41 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1833322 Change-Id: Ib48845d67ba778d9138e4051e1e65b591739bca4
2021-10-05Merge "Upgrade rust/crates/proc-macro2 to 1.0.29" am: 8129d0cb0c am: f2619ed659Stephen Hines
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1833322 Change-Id: Ieb1571be180e4a363b675f7c3f568f69dd0dddaf
2021-10-05Merge "Upgrade rust/crates/proc-macro2 to 1.0.29" am: 8129d0cb0candroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Stephen Hines
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1833322 Change-Id: Idf9e14368ab65ac919aec3a0e2d0f50de6970a3f
2021-10-05Merge "Upgrade rust/crates/proc-macro2 to 1.0.29"Stephen Hines
2021-10-01Update TEST_MAPPING am: a7d8f12d8c am: eb3427c074 am: d30f1d8494 am: ↵Joel Galenson
5afc11ef8d am: 268158b6d9 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1843533 Change-Id: Ie95fb987ae6de11aa7e86b84c61ee6cb6c205fa2
2021-10-01Update TEST_MAPPING am: a7d8f12d8c am: eb3427c074 am: d30f1d8494 am: 5afc11ef8dJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1843533 Change-Id: I7b545158b947af53f903c363152e65ab78977fb9
2021-10-01Update TEST_MAPPING am: a7d8f12d8c am: eb3427c074 am: d30f1d8494Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1843533 Change-Id: Id05a12b8e844f4b73eb3e757c37facd941e8c846
2021-10-01Update TEST_MAPPING am: a7d8f12d8c am: eb3427c074Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1843533 Change-Id: I172b6e7cf0093e54d9f3f4c01c961aba3066ff64
2021-10-01Update TEST_MAPPING am: a7d8f12d8cJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1843533 Change-Id: I972c41f63fba5716271fac70508dc4486117a31c
2021-10-01Update TEST_MAPPINGJoel Galenson
Test: None Change-Id: Id4d8b6ad9d4884df7b75400a1c05bdf2ed788ac5
2021-09-22Upgrade rust/crates/proc-macro2 to 1.0.29Joel Galenson
Test: make Change-Id: I78e7ca2609d95d74b6c251a90b119e0de49a7e25
2021-08-30Update TEST_MAPPING am: a44e52188a am: 71c898f729 am: 67ebf413f1 am: ↵Joel Galenson
03a1ebdf5f am: 793f27664b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1813888 Change-Id: Ideb297437a400e823fa56da440804f149a70dbe7
2021-08-30Update TEST_MAPPING am: a44e52188a am: 71c898f729 am: 67ebf413f1 am: 03a1ebdf5fJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1813888 Change-Id: I7bf006a9e7671f49bf1ab2e3e769931f77970d29
2021-08-30Update TEST_MAPPING am: a44e52188a am: 71c898f729 am: 67ebf413f1Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1813888 Change-Id: I7c7f772b6e85e30a71d16a65216fa9957717f950
2021-08-30Update TEST_MAPPING am: a44e52188a am: 71c898f729Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1813888 Change-Id: I33105920fc0d6ed66c01039d47a529a978232ef3
2021-08-30Update TEST_MAPPING am: a44e52188aJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1813888 Change-Id: I43d13b65dc0797091c70063ad7b97d2cc6db930a
2021-08-30Update TEST_MAPPINGandroid-s-beta-5android-s-beta-5Joel Galenson
Test: None Change-Id: I37a2735f7b45132c52dcfb408f9aa027f33d9e6c
2021-08-24Update TEST_MAPPING am: ed9fcbac2e am: 0b2de3ac51 am: 2455d3a07a am: ↵Joel Galenson
c3e6c2170a am: 261ecbf0e4 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1806183 Change-Id: I82e6aaab71963bb773c995da8f763da4083aba81
2021-08-24Update TEST_MAPPING am: ed9fcbac2e am: 0b2de3ac51 am: 2455d3a07a am: c3e6c2170aJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1806183 Change-Id: Iff747430ae64c40f73f35b3b9aa9eb3da216ef79
2021-08-24Update TEST_MAPPING am: ed9fcbac2e am: 0b2de3ac51 am: 2455d3a07aJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1806183 Change-Id: Ib5c970341cbbfe83c61b51c96a3074e14696c595
2021-08-24Update TEST_MAPPING am: ed9fcbac2e am: 0b2de3ac51Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1806183 Change-Id: Id94c0d07c97532b0d5903cee48e36469676d52a4
2021-08-24Update TEST_MAPPING am: ed9fcbac2eJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1806183 Change-Id: I006d2447886031305ad015071dc80ece8177a9fc
2021-08-23Update TEST_MAPPINGJoel Galenson
Test: None Change-Id: If7fe82b888b8bcf31cffdc94329088d6f7f1f12f
2021-08-14[automerger skipped] Mark sc-dev-plus-aosp-without-vendor@7634622 as merged ↵Xin Li
am: a75295d4c8 -s ours am: c08a68854d -s ours am: 897921e3b7 -s ours am: 906f304255 -s ours am skip reason: Merged-In I12ab6e302ee9323126dff57cb91fbd5d7df3661b with SHA-1 72bcc555f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/15570658 Change-Id: Ib762d229b0fa3d9d5009835543223ec6d49a88d0
2021-08-14[automerger skipped] Mark sc-dev-plus-aosp-without-vendor@7634622 as merged ↵Xin Li
am: a75295d4c8 -s ours am: c08a68854d -s ours am: 897921e3b7 -s ours am skip reason: Merged-In I12ab6e302ee9323126dff57cb91fbd5d7df3661b with SHA-1 72bcc555f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/15570658 Change-Id: I89b6745393c238f69ff3bd0f616c6d218065d267
2021-08-14[automerger skipped] Mark sc-dev-plus-aosp-without-vendor@7634622 as merged ↵Xin Li
am: a75295d4c8 -s ours am: c08a68854d -s ours am skip reason: Merged-In I12ab6e302ee9323126dff57cb91fbd5d7df3661b with SHA-1 72bcc555f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/15570658 Change-Id: Ic4e5629e56d198e995f53d8590cb56a22b32ea9e
2021-08-14[automerger skipped] Mark sc-dev-plus-aosp-without-vendor@7634622 as merged ↵Xin Li
am: a75295d4c8 -s ours am skip reason: Merged-In I12ab6e302ee9323126dff57cb91fbd5d7df3661b with SHA-1 72bcc555f4 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/15570658 Change-Id: I47f41b06cbf2b18d33863a73dc0c3753c22f669e
2021-08-14Mark sc-dev-plus-aosp-without-vendor@7634622 as mergedXin Li
Merged-In: I12ab6e302ee9323126dff57cb91fbd5d7df3661b Change-Id: I270ba0a8e03e80ace9486066478ef06acf5e6171
2021-08-13Upgrade rust/crates/proc-macro2 to 1.0.28 am: 35062ef8f2 am: 506543cf88 am: ↵Joel Galenson
20eb864708 am: 6b65506c47 am: 6501b3a80a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1791035 Change-Id: I9c3c5ec83bb2e0cf5bcac57c278f7231aa439ffc
2021-08-13Upgrade rust/crates/proc-macro2 to 1.0.28 am: 35062ef8f2 am: 506543cf88 am: ↵Joel Galenson
20eb864708 am: 6b65506c47 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1791035 Change-Id: I85ea620e54109614fa7b639cbe3d821cc2c51cf7
2021-08-13Upgrade rust/crates/proc-macro2 to 1.0.28 am: 35062ef8f2 am: 506543cf88 am: ↵Joel Galenson
20eb864708 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1791035 Change-Id: Ib589f1ee79b8528993dae03dd869cb3e5d69c3db
2021-08-13Upgrade rust/crates/proc-macro2 to 1.0.28 am: 35062ef8f2 am: 506543cf88Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1791035 Change-Id: I9909ceba4761a61ade167159a42f41c654ac544d
2021-08-13Upgrade rust/crates/proc-macro2 to 1.0.28 am: 35062ef8f2Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1791035 Change-Id: I8c7101e251eccef0cf634ab51da21d3c38d84950
2021-08-09Upgrade rust/crates/proc-macro2 to 1.0.28Joel Galenson
Test: make Change-Id: I83a1c427db2bd60913d19953bcd2ec5c18eb2d46
2021-07-06Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPING am: ↵easoncylee
3166edd929 am: 27cad0a9bc am: 72bcc555f4 am: 15ead895e9 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1755596 Change-Id: I210d950411530215b3db3ad2ecc083271400c281
2021-07-06Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPING am: ↵easoncylee
3166edd929 am: 27cad0a9bc am: 72bcc555f4 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1755596 Change-Id: I72c96be1b1f568b7a812e719a00dadd8ecb2d05c
2021-07-06Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPING am: ↵easoncylee
3166edd929 am: 27cad0a9bc Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1755596 Change-Id: I12ab6e302ee9323126dff57cb91fbd5d7df3661b
2021-07-06Update vpnprofilestore_test to legacykeystore_test in TEST_MAPPING am: ↵easoncylee
3166edd929 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1755596 Change-Id: I0a8c5d41928bdd4006f394d60af723d2f92ae9ef
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: I4891a357756f063ac4e8e0260f8b5a6dbe858617
2021-06-22Upgrade rust/crates/proc-macro2 to 1.0.27 am: d363fd51c7 am: ff9054bed3 am: ↵Joel Galenson
b7cf10fe07 am: aa16603b25 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1742519 Change-Id: Ice578265130a55484326c3bdbb7d09c70e6543e7
2021-06-22Upgrade rust/crates/proc-macro2 to 1.0.27 am: d363fd51c7 am: ff9054bed3 am: ↵Joel Galenson
b7cf10fe07 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1742519 Change-Id: I4a3e8c0182bea24d7e3b87130c9e6be66eef755f
2021-06-22Upgrade rust/crates/proc-macro2 to 1.0.27 am: d363fd51c7 am: ff9054bed3Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro2/+/1742519 Change-Id: I9502108612a64abd3ebc0a3bdc3502b44fa4ff06