aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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: Icb0a812f496883724534a465a5efe309a57b3de5
2021-08-24Update TEST_MAPPING am: 79c8cd641b am: a0685be00d am: 8324a583eeJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1806122 Change-Id: I2e503c45b6d5d819f24d8532f73d1567859c2707
2021-08-24Update TEST_MAPPING am: 79c8cd641b am: a0685be00dJoel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1806122 Change-Id: I26d3f9b5ae2aec6bfcfaa44bad32284877cdbef1
2021-08-24Update TEST_MAPPING am: 79c8cd641bandroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1806122 Change-Id: I9150f8a02290809206b71c295b1eda33eca63f77
2021-08-23Update TEST_MAPPINGandroid-s-beta-5android-s-beta-5Joel Galenson
Test: None Change-Id: Iab5c700a1be1172973b6a5d5289c9a3186cdcbe1
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 77a2f51816 -s ↵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-releaseXin Li
ours am: a647bf253a -s ours am skip reason: Change-Id I06497beddfc08af0a44c83a2b15f25790813fd74 with SHA-1 a99fbe9770 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib21870246b8fd87359103ecf3ed862f93ef010ba
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 77a2f51816 -s oursXin Li
am skip reason: Change-Id I06497beddfc08af0a44c83a2b15f25790813fd74 with SHA-1 a99fbe9770 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia5fe476a2158b0712349f8fbe32a4d58fc006bca
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-4Xin Li
Bug: 180401296 Merged-In: I06497beddfc08af0a44c83a2b15f25790813fd74 Change-Id: I3b47b5a5aa39843ee6b87bb53e384d53242dca75
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to ↵Treehugger Robot
external/rust/crates/proc-macro-hack" am: 1d2d720066 am: 5639dd9636 am: 7934ac14f5 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1588742 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ia43f2562c75ff00d76ba1bde0cba78162787a9f5
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to ↵Treehugger Robot
external/rust/crates/proc-macro-hack" am: 1d2d720066 am: 5639dd9636 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1588742 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I95d318c8125c9861b69edebe0023f8bbb031be8d
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to ↵Treehugger Robot
external/rust/crates/proc-macro-hack" am: 1d2d720066 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1588742 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I13d8b702d931339a05936cd926b8f70e42ce95ad
2021-02-16Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/proc-macro-hack"android-s-preview-1Treehugger Robot
2021-02-16Merge "Clean up rust_test_host TEST_MAPPING after default update" am: ↵Treehugger Robot
23d64a9487 am: 845a8d7c6c am: b89160a5d3 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1589933 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I16fe2f1b6d661fec2b7d55f9adcd31b7faa6fa51
2021-02-16Merge "Clean up rust_test_host TEST_MAPPING after default update" am: ↵Treehugger Robot
23d64a9487 am: 845a8d7c6c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1589933 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I344e588df7b79ea7f1b4efaeae5b20cdfc52d5de
2021-02-16Clean up rust_test_host TEST_MAPPING after default update am: 83bfeaf233 am: ↵Julien Desprez
541812636d am: 6b7e750d2a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1589815 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3de4eebc2d2ccf3323876feb40f9178062534be9
2021-02-16Merge "Clean up rust_test_host TEST_MAPPING after default update" am: 23d64a9487Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1589933 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2818a8e2aef69640f35fbd3562e744e603981e69
2021-02-16Merge "Clean up rust_test_host TEST_MAPPING after default update"Treehugger Robot
2021-02-16Clean up rust_test_host TEST_MAPPING after default update am: 83bfeaf233 am: ↵Julien Desprez
541812636d Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1589815 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifb1be42a0733dcb723d8a671a4b8d7078b7e93d9
2021-02-16Clean up rust_test_host TEST_MAPPING after default update am: 83bfeaf233Julien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1589815 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1566e98b8d60d79253857cae661028b001c51052
2021-02-16Clean up rust_test_host TEST_MAPPING after default updateJulien Desprez
After b/177689340, rust_test_host doesn't need TEST_MAPPING config anymore to run in presubmit. Change-Id: Ibf08fd274566408810c32fbeb9dc40adb9ad8609 Test: presubmit Bug: 178646865
2021-02-16Clean up rust_test_host TEST_MAPPING after default updateJulien Desprez
After b/177689340, rust_test_host doesn't need TEST_MAPPING config anymore to run in presubmit. Change-Id: Iba2be9820355eb43961ac6f29b1b12b8226984cb Test: presubmit Bug: 178646865
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/proc-macro-hackBob 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: Ib0b9fe6fbed2c97a0955888b74beffc01747d347
2020-11-24Mark ab/6881855 as merged am: b857069d32 am: a99fbe9770Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/13111561 Change-Id: Id41369b1d7484d2adca7a8b9d3441dce471ee26d
2020-11-24Mark ab/6881855 as merged am: b857069d32Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/13111561 Change-Id: I06497beddfc08af0a44c83a2b15f25790813fd74
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: Ice39a7fc8ffe142c19d0ca1a14c8d03bdc13f75f
2020-11-05TEST_MAPPING: test dependers of this crate am: c3c435f25c am: 7c0d828943 am: ↵Jeff Vander Stoep
e5fd559b43 am: 8bf8026416 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1488772 Change-Id: I6b654473bbf98d5cb1d1a91f0538e332370c884c
2020-11-05TEST_MAPPING: test dependers of this crate am: c3c435f25c am: 7c0d828943 am: ↵Jeff Vander Stoep
e5fd559b43 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1488772 Change-Id: Id8d114c486a16ace2c318430aaa9dce5edad315f
2020-11-05TEST_MAPPING: test dependers of this crate am: c3c435f25c am: 7c0d828943Jeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1488772 Change-Id: If1896c1878de57ebf02b713494144d2c327eb5fb
2020-11-05TEST_MAPPING: test dependers of this crate am: c3c435f25cJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1488772 Change-Id: I31e1f24f72e98433e23f06797121e137c442e1a2
2020-11-05TEST_MAPPING: test dependers of this crateJeff Vander Stoep
Bug: 168167373 Test: TH Change-Id: If727ee009351085bf7d28b3eca946ed9126d7c4d
2020-10-29Upgrade rust/crates/proc-macro-hack to 0.5.19 am: b0dbc7637b am: a0e5ba1598 ↵Haibo Huang
am: 489b66eaac am: 3de14db89e Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1478509 Change-Id: If0d660e348929f726d6be76ceb85382b3b4fa529
2020-10-29Upgrade rust/crates/proc-macro-hack to 0.5.19 am: b0dbc7637b am: a0e5ba1598 ↵Haibo Huang
am: 489b66eaac Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1478509 Change-Id: I66c239761584603d9de03e16c7fbdb8836ed3cd2
2020-10-29Upgrade rust/crates/proc-macro-hack to 0.5.19 am: b0dbc7637b am: a0e5ba1598Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1478509 Change-Id: I9b7d01c3c0dc891c4a7305924cac1c36c1e1e178
2020-10-29Upgrade rust/crates/proc-macro-hack to 0.5.19 am: b0dbc7637bHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1478509 Change-Id: I03147a5b09cba8ee8af9ebfa8f9688201cbb3c70
2020-10-28Upgrade rust/crates/proc-macro-hack to 0.5.19Haibo Huang
Test: make Change-Id: I3ca9b7f663f7fa6b81473e30e37940593c0c4af9
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 01d450bf11 -s ours am: ↵Xin Li
774b82a1cc -s ours am: f7a7dedba5 -s ours am skip reason: Change-Id I4aaa00bf2dac3364a2d60862656734af5609820c with SHA-1 0bf02b7ab8 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/12796988 Change-Id: I99c85c18c6a3203a7bb250f404a2a3d6e0a37681
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 01d450bf11 -s ours am: ↵Xin Li
774b82a1cc -s ours am skip reason: Change-Id I4aaa00bf2dac3364a2d60862656734af5609820c with SHA-1 0bf02b7ab8 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/12796988 Change-Id: I80ff508e7797ad372d484b2463ee25a20b2b0ea4
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: 01d450bf11 -s oursXin Li
am skip reason: Change-Id I4aaa00bf2dac3364a2d60862656734af5609820c with SHA-1 0bf02b7ab8 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/12796988 Change-Id: I5a4d2439982c358da38dfbb578e390ffc9fe1894
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: I4aaa00bf2dac3364a2d60862656734af5609820c Change-Id: Ic467ee8c638dd6a5d185462379b1aaff07f86edd
2020-08-28Fix proc-macro-hack/METADATA am: 27cf86656f am: 4fdc88bcd3 am: 71593b5e3e ↵Chih-Hung Hsieh
am: 2b7721972c am: b6566b8e51 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1413755 Change-Id: I683990d08e0b9cb256e8deb074cc46d313f8d9a5
2020-08-27Fix proc-macro-hack/METADATA am: 27cf86656f am: 4fdc88bcd3 am: 71593b5e3e ↵Chih-Hung Hsieh
am: 2b7721972c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1413755 Change-Id: I9839b6ba2db67cb4d3373e8a09b4e2de9b69049a
2020-08-27Fix proc-macro-hack/METADATA am: 27cf86656f am: 4fdc88bcd3 am: 71593b5e3eChih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1413755 Change-Id: I031e06f2e2ed21e39a053b1d07409891cfab868d
2020-08-27Fix proc-macro-hack/METADATA am: 27cf86656f am: 4fdc88bcd3Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1413755 Change-Id: I338a7c42b4e963a7ef14f24452af8844b79b467a
2020-08-27Fix proc-macro-hack/METADATA am: 27cf86656fChih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/1413755 Change-Id: I45afc8fc671563de5fa7dce824a905426ac70921
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 19ddfa96b3 -s ours am: f6b45b0438 -s ours am: 8b052418e4 -s ours am: 5dd3c4baa9 -s ours am skip reason: Change-Id I6af29ba2ac8fc203419da6665cd9824bbb3c3cc4 with SHA-1 55547b2579 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/12469915 Change-Id: I3de3b0eaf114df8be80eb2dd752f535665344708
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 19ddfa96b3 -s ours am: f6b45b0438 -s ours am: 8b052418e4 -s ours am skip reason: Change-Id I6af29ba2ac8fc203419da6665cd9824bbb3c3cc4 with SHA-1 55547b2579 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/12469915 Change-Id: Icb83ddbce17c6166f2bcd594b59cf89c5273249d
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 19ddfa96b3 -s ours am: f6b45b0438 -s ours am skip reason: Change-Id I6af29ba2ac8fc203419da6665cd9824bbb3c3cc4 with SHA-1 55547b2579 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/12469915 Change-Id: I891ce9eef7078ef806655e4f496ca1c32ea7fae4
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 19ddfa96b3 -s ours am skip reason: Change-Id I6af29ba2ac8fc203419da6665cd9824bbb3c3cc4 with SHA-1 55547b2579 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/proc-macro-hack/+/12469915 Change-Id: Ib784838793b486fcd3ca8836f02f953fdb272172
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I6af29ba2ac8fc203419da6665cd9824bbb3c3cc4 Change-Id: Ie5427aa64f26357669a333ffa3d52e20c70ab5cc