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: Ifc9a17fc04504e33a3b2de6c36766b9c66de41eb
2021-10-19Enable tests am: 9c82f72e3aJeff Vander Stoep
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1862860 Change-Id: I6fc9d474d9dafcc69e515faf8d7d29911a801d0a
2021-10-19Enable testsandroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Jeff Vander Stoep
Test: atest ------- x86_64 termcolor_host_test_src_lib: Passed: 13, Failed: 0, Ignored: 0, Assumption Failed: 0, x86 termcolor_device_test_src_lib: Passed: 13, Failed: 0, Ignored: 0, Assumption Failed: 0, Change-Id: Ia8698b0f93e75c38d6fe0fd4d64f68a543521ff5
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d2ef9b12ab -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: 029dd50d83 -s ours am skip reason: Change-Id I6040dc4413f74f5bad1b8cc8352b8a15ae1d8636 with SHA-1 a2db67b664 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I62c11c6af3493d1170ec9110e2d9a72a490485d5
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: d2ef9b12ab -s oursXin Li
am skip reason: Change-Id I6040dc4413f74f5bad1b8cc8352b8a15ae1d8636 with SHA-1 a2db67b664 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I90d83bf24eb189d28cd9e22846f7b5b67998cb76
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: I6040dc4413f74f5bad1b8cc8352b8a15ae1d8636 Change-Id: I506508694b63c46ba8762409d2b2933f0af0aca7
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/termcolor am: ↵Bob Badour
b065968da0 am: 08d5b051cf am: c2291b1ab8 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1588751 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2362301c3ab8d09458d69dcaab769540572d51c3
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/termcolor am: ↵Bob Badour
b065968da0 am: 08d5b051cf Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1588751 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I59fd8744aa435d7c6771f54da5b52b4a8a7a9877
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/termcolor am: b065968da0Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1588751 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ifa7b4847878f0f6e3144a4ff8f711665942202c3
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/termcolorandroid-s-preview-1Bob Badour
Added SPDX-license-identifier-MIT SPDX-license-identifier-Unlicense to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Iead3be3c8ff1d58e508193417014806cade3e132
2020-11-25Mark ab/6881855 as merged am: 2ae2995054 am: a2db67b664Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/13111231 Change-Id: Ib57377afbde53f0fc63039dc01e5d86302e7e5f2
2020-11-25Mark ab/6881855 as merged am: 2ae2995054Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/13111231 Change-Id: I6040dc4413f74f5bad1b8cc8352b8a15ae1d8636
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I5e7540e8d990cf33c3d1dd68291e23d954dd7184
2020-11-23Upgrade rust/crates/termcolor to 1.1.2 am: 3128b854ea am: ce1a0d1d89 am: ↵Haibo Huang
050af3191e Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1505811 Change-Id: If9224032263f20345855bd273e0ae6a14a1fcfff
2020-11-23Upgrade rust/crates/termcolor to 1.1.2 am: 3128b854ea am: ce1a0d1d89Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1505811 Change-Id: I18a5abc9eecca7ff4d05fd35e1ffa1990f91d43e
2020-11-23Upgrade rust/crates/termcolor to 1.1.2 am: 3128b854eaHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1505811 Change-Id: I6a72192048d9a38c5db31847822697937f738e3a
2020-11-19Upgrade rust/crates/termcolor to 1.1.2Haibo Huang
Test: make Change-Id: Ied6674c9b818beb26ffc8b6cbbe705da89f1ec2c
2020-10-12[automerger skipped] Skip ab/6749736 in stage. am: bc625adc38 -s ours am: ↵Xin Li
fc6ee677de -s ours am: 7f8338dd63 -s ours am skip reason: Change-Id Ic98b736d0bb0fe163baed5ecff9e423423955c28 with SHA-1 9ac737138f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/12797263 Change-Id: I866de48632f8b44943d59f3bd8f83b8656ef7a51
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: bc625adc38 -s ours am: ↵Xin Li
fc6ee677de -s ours am skip reason: Change-Id Ic98b736d0bb0fe163baed5ecff9e423423955c28 with SHA-1 9ac737138f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/12797263 Change-Id: I10443fe09a09fa59dd20605a9843b8339123dddc
2020-10-09[automerger skipped] Skip ab/6749736 in stage. am: bc625adc38 -s oursXin Li
am skip reason: Change-Id Ic98b736d0bb0fe163baed5ecff9e423423955c28 with SHA-1 9ac737138f is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/12797263 Change-Id: Id95c97b75c74dc5c7f186f1ba4585200fec7493e
2020-10-08Skip ab/6749736 in stage.Xin Li
Merged-In: Ic98b736d0bb0fe163baed5ecff9e423423955c28 Change-Id: Ia1b7cd737ab7dff25095f01aa1f02f70fc7759c7
2020-08-28Fix termcolor/METADATA am: 6074575811 am: fac79ae367 am: 33da30f336 am: ↵Chih-Hung Hsieh
fd8d40ec93 am: ea105a6d89 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1414095 Change-Id: I492d1bdd2fe1280b078a18865077ca49e9f1359a
2020-08-27Fix termcolor/METADATA am: 6074575811 am: fac79ae367 am: 33da30f336 am: ↵Chih-Hung Hsieh
fd8d40ec93 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1414095 Change-Id: I03a06c284603a7603215b208b2fb877d2327a9b5
2020-08-27Fix termcolor/METADATA am: 6074575811 am: fac79ae367 am: 33da30f336Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1414095 Change-Id: I1dcfee12378a4b971ed49470ebd9fee451a434d1
2020-08-27Fix termcolor/METADATA am: 6074575811 am: fac79ae367Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1414095 Change-Id: I163de2866494b756290ae350cd3f543a30b76cb6
2020-08-27Fix termcolor/METADATA am: 6074575811Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1414095 Change-Id: Ieb84ca434fb0b829d6630540b3e702b6549d8870
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 0f3ea28532 -s ours am: 5ae3ece633 -s ours am: 014a53f7fb -s ours am: 26fc05e04e -s ours am skip reason: Change-Id I4171de3799d96380a1c66b698f09eead1d9000ab with SHA-1 a4acb01ee9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/12469398 Change-Id: Ia0de76cde755c0994f91e21b1a0d6d344283b984
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 0f3ea28532 -s ours am: 5ae3ece633 -s ours am: 014a53f7fb -s ours am skip reason: Change-Id I4171de3799d96380a1c66b698f09eead1d9000ab with SHA-1 a4acb01ee9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/12469398 Change-Id: I0f809d2679d4781da97aee172455562848b92269
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 0f3ea28532 -s ours am: 5ae3ece633 -s ours am skip reason: Change-Id I4171de3799d96380a1c66b698f09eead1d9000ab with SHA-1 a4acb01ee9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/12469398 Change-Id: I0383c174300c410cd5fdaf54d9da157f555bbf5d
2020-08-27[automerger skipped] Mark Android R ↵Xin Li
(rvc-dev-plus-aosp-without-vendor@6692709) as merged am: 0f3ea28532 -s ours am skip reason: Change-Id I4171de3799d96380a1c66b698f09eead1d9000ab with SHA-1 a4acb01ee9 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/12469398 Change-Id: I51dd0978b7dd0ffb7ebb0b1aea3923d8cc3ee868
2020-08-27Mark Android R (rvc-dev-plus-aosp-without-vendor@6692709) as mergedXin Li
Bug: 166295507 Merged-In: I4171de3799d96380a1c66b698f09eead1d9000ab Change-Id: I15d6fe2389f1daeb355f540865a99b795501d17b
2020-08-25Fix termcolor/METADATAChih-Hung Hsieh
Bug: 166324735 Test: make Change-Id: Icf166ac33161ebe74fb3d1da99a01b86c887dfc5
2020-07-31Add Android.bp am: add50e0e3e am: 0896187b5a am: e2b877e720 am: 9ac737138f ↵Matthew Maurer
am: 269d768477 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1330155 Change-Id: If63414eb44cbec36801594dc36961b3c664826f7
2020-07-31Add Android.bp am: add50e0e3e am: 0896187b5a am: e2b877e720 am: 9ac737138fMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1330155 Change-Id: Idd66d5fa3c85e66386932027a596194a32a77c2a
2020-07-31Add Android.bp am: add50e0e3e am: 0896187b5a am: e2b877e720Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1330155 Change-Id: Ic98b736d0bb0fe163baed5ecff9e423423955c28
2020-07-31Add Android.bp am: add50e0e3e am: 0896187b5aMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1330155 Change-Id: Ia4c1fb5e3c986f515a3c9c4aa1940a1c36df38cd
2020-07-31Add Android.bp am: add50e0e3eMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1330155 Change-Id: Ibf9cb80c0206023e41139f59d4ebb3a4d7c8804f
2020-07-30Add Android.bpMatthew Maurer
Don't enable tests to avoid pulling in dependencies Bug: 156285485 Test: mma Change-Id: I53670b8809d36078bd964eabe6ac20080004ee1a
2020-07-07Add OWNERS am: 09efe54441 am: 40703bbe9a am: a4acb01ee9 am: 8b228483e5 am: ↵Chih-Hung Hsieh
fe7546cec9 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1356530 Change-Id: I5d3e043f72663797693050f01c1e92c7726d15b9
2020-07-07Add OWNERS am: 09efe54441 am: 40703bbe9a am: a4acb01ee9 am: 8b228483e5Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1356530 Change-Id: Ie06a3f443be5d24a23434fd1840987477dadcd08
2020-07-07Add OWNERS am: 09efe54441 am: 40703bbe9a am: a4acb01ee9Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1356530 Change-Id: Ibf9c3b22d16703f3bcaf2994a25cb8b1d350fa56
2020-07-07Add OWNERS am: 09efe54441 am: 40703bbe9aChih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1356530 Change-Id: I4171de3799d96380a1c66b698f09eead1d9000ab
2020-07-07Add OWNERS am: 09efe54441Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1356530 Change-Id: Ia7b4c4715803fe12136dab1508782079e91b003e
2020-07-07Add OWNERSplatform-tools-30.0.4android-r-beta-3android-r-beta-2Chih-Hung Hsieh
Bug: 158624751 Test: make Change-Id: I5e2727b6e3fe65605edd0bac6487ace00a9e553e
2020-06-05Add METADATA / Licensing info am: 3601096306 am: 0123e4f07b am: 417d1f3ea8 ↵Matthew Maurer
am: ac0d527f7a am: 2993e3a765 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1321870 Change-Id: Ia677d59cc5c57220d8cb36f87965670323a8b9c0
2020-06-05Import termcolor-1.1.0 am: e1f9df28cb am: a9dd1eb299 am: 43e80fd143 am: ↵Matthew Maurer
f31501bdf0 am: 28fe146896 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1321869 Change-Id: I8105f41c4bd0728006ee767b070f7998f5cd5117
2020-06-05Add METADATA / Licensing info am: 3601096306 am: 0123e4f07b am: 417d1f3ea8 ↵Matthew Maurer
am: ac0d527f7a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1321870 Change-Id: Ia36e6eeb5cc8145ed104a633c9070fa136f0cb34
2020-06-05Import termcolor-1.1.0 am: e1f9df28cb am: a9dd1eb299 am: 43e80fd143 am: ↵Matthew Maurer
f31501bdf0 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1321869 Change-Id: I0aa7754b2b959cfe09980e28b8e1d3bb8bb0269e
2020-06-05Add METADATA / Licensing info am: 3601096306 am: 0123e4f07b am: 417d1f3ea8Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/termcolor/+/1321870 Change-Id: I57d2ad90882eca0c6d189eb7de5aae5e003da50f