aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-10-13Snap for 10942032 from 754805dd611fc95ac5ae756b4df6be1a4fe35e13 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
Change-Id: I8f565970c5c4507a4e3996cebd47d179dbcd0d8c
2023-10-11Merge "Update Android.bp to reflect aosp/2763825" into main am: ceb7293ec1 ↵James Farrell
am: 992454afd9 am: e03ec7b124 am: ddabe865e0 am: 86f84fe06b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2776454 Change-Id: I6e43b0df2f4828718e20532e5451539e0392f9ae Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11Merge "Update Android.bp to reflect aosp/2763825" into main am: ceb7293ec1 ↵James Farrell
am: 992454afd9 am: e03ec7b124 am: ddabe865e0 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2776454 Change-Id: Iee494b1eb4a7360180a3e901483a55510ac8a185 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11Merge "Update Android.bp to reflect aosp/2763825" into main am: ceb7293ec1 ↵James Farrell
am: 992454afd9 am: e03ec7b124 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2776454 Change-Id: Ifb0dcac0ca139f831041621b6bb67a4af523f61e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11Merge "Update Android.bp to reflect aosp/2763825" into main am: ceb7293ec1 ↵James Farrell
am: 992454afd9 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2776454 Change-Id: I7c151fe90e380e1d8a7dc887586e3159f21bef4c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11Merge "Update Android.bp to reflect aosp/2763825" into main am: ceb7293ec1James Farrell
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2776454 Change-Id: I367f720979445f8701ea7ad222b478cef9a0da9a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-10-11Merge "Update Android.bp to reflect aosp/2763825" into mainJames Farrell
2023-10-05Update Android.bp to reflect aosp/2763825James Farrell
Test: Ran cargo2android. Treehugger. Change-Id: I6a9cbe11024c3b96750b934ef7eec1cc84702efb
2023-09-21Snap for 10843824 from 2204d7a4a8069166045c7909623ab65aa04ff4b4 to 24Q1-releaseAndroid Build Coastguard Worker
Change-Id: I834868a2af14bb7a0ee3326e3330a6759605806d
2023-09-14Cleanup cargo2android configs and patches am: b6e7b60fac am: 6a100f34b2 am: ↵James Farrell
c2101c7e57 am: ab95f79eac am: 3a4991549c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2751204 Change-Id: Ic3f60d33ac4e8049d886845b1e0909e2abcb0e00 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14Cleanup cargo2android configs and patches am: b6e7b60fac am: 6a100f34b2 am: ↵James Farrell
c2101c7e57 am: ab95f79eac Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2751204 Change-Id: I5105f3c1309d0ecdc506774328be3f883ee036cc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14Cleanup cargo2android configs and patches am: b6e7b60fac am: 6a100f34b2 am: ↵James Farrell
c2101c7e57 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2751204 Change-Id: Iec7c4d69a625f5bfca9089c8c6f1b20d4f733d4b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14Cleanup cargo2android configs and patches am: b6e7b60fac am: 6a100f34b2James Farrell
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2751204 Change-Id: I9224f921d4b21171d34fc0d07a0682fc052ce1ec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-14Cleanup cargo2android configs and patches am: b6e7b60facJames Farrell
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2751204 Change-Id: I02e5455b6f4cf26892e7bdcf933eb663a14e02fe Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-13Cleanup cargo2android configs and patchesJames Farrell
Use name-suffix and dep-suffixes (aosp/2751102) and remove patches no longer needed as a result. Other minor cleanups to eliminate diffs in Android.bp files Test: Ran cargo2android Change-Id: I4c9f209d83fa1399c8b8a5fc7abadb1d075c01d6
2023-07-18Move OWNER reference master=>main. am: c67c6b4226 am: a163c5171c am: ↵Sam Saccone
40b0aee53c am: 9213f7ae65 am: 9fb4efbfb4 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2662504 Change-Id: I11738f2031f20f63425c20534a8d60bec3f7a91e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main. am: c67c6b4226 am: a163c5171c am: ↵Sam Saccone
40b0aee53c am: 9213f7ae65 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2662504 Change-Id: Id78f6b01c80c84214fffa0548283dbaf3eb4190b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main. am: c67c6b4226 am: a163c5171c am: 40b0aee53cSam Saccone
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2662504 Change-Id: I0b579869c28d85a703bc6d9dd0c98435dadbafcb Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main. am: c67c6b4226 am: a163c5171cSam Saccone
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2662504 Change-Id: I56d8ae7b03f51ecadf8e187988b86cdc690d5908 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main. am: c67c6b4226Sam Saccone
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2662504 Change-Id: I107392824eaa7394f32664ee41ab5886523f5ed3 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Move OWNER reference master=>main.Sam Saccone
BUG=b/291759353 Change-Id: I4238377fab3eb15043a617a65428f4feebff7311
2023-05-27Update to syn-2 am: 5dbe9b3628 am: a615e438e6 am: 842a3d2868 am: 22a9bf8b6d ↵Matthew Maurer
am: 27da28c795 am: a8bb301a30 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2520381 Change-Id: I108d82231b873d24f55d3fb1866c71475ff9ca85 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-27Update to syn-2 am: 5dbe9b3628 am: a615e438e6 am: 842a3d2868 am: 22a9bf8b6d ↵Matthew Maurer
am: 27da28c795 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2520381 Change-Id: Id2d2e262d4b4cfb148a947063ddb7cd3c1a3c79a Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-27Update to syn-2 am: 5dbe9b3628 am: a615e438e6 am: 842a3d2868 am: 22a9bf8b6dMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2520381 Change-Id: Iccc4afb7dab3322f00052cff96566c8beafd2701 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26Update to syn-2 am: 5dbe9b3628 am: a615e438e6 am: 842a3d2868Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2520381 Change-Id: I7b9821b2db3b9e623a37f6abe8cba37ef411e2db Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26Update to syn-2 am: 5dbe9b3628 am: a615e438e6Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2520381 Change-Id: I636f4fe81916c93b27abc494d3e030559250e077 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-26Update to syn-2 am: 5dbe9b3628Matthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2520381 Change-Id: I0230eb9e65060c2fd3ce5870c29c2468e981400f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03Update to syn-2Matthew Maurer
Bug: 276463929 Test: m Change-Id: Ie9da7edd471f029d4d26f5b914c6b3c608ebc5fd
2023-03-09Merge "Make merge_derive available to product and vendor am: ce3292f0c4 am: ↵Automerger Merge Worker
f319f4cfbb am: f941cedee4 am: 23aa87e26a am: 4014fd467a"
2023-03-09Make merge_derive available to product and vendor am: ce3292f0c4 am: ↵Matthew Maurer
f319f4cfbb am: f941cedee4 am: 23aa87e26a am: 4014fd467a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2476444 Change-Id: I7d5d16e2dbb38e1f0f0a70042bf8f0724752bd16 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make merge_derive available to product and vendor am: ce3292f0c4 am: ↵Matthew Maurer
f319f4cfbb am: f941cedee4 am: 23aa87e26a am: 68d48c2fed Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2476444 Change-Id: Id35b3e482cf72e69e4d71b51eea595145a79ddab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make merge_derive available to product and vendor am: ce3292f0c4 am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseMatthew Maurer
f319f4cfbb am: f941cedee4 am: 23aa87e26a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2476444 Change-Id: I25022dee6d03cc61965aff698c25190ebaa2c6cd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make merge_derive available to product and vendor am: ce3292f0c4 am: ↵aml_wif_341610000aml_wif_341510000aml_wif_341410080aml_wif_341310010aml_wif_341110010aml_wif_341011010aml_wif_340913010aml_uwb_341513070aml_uwb_341511050aml_uwb_341310300aml_uwb_341310030aml_uwb_341111010aml_uwb_341011000aml_tet_341610020aml_tet_341511010aml_tet_341411060aml_tet_341310230aml_tet_341112070aml_tet_341010040aml_tet_340913030aml_swc_341619000aml_swc_341513600aml_swc_341312300aml_swc_341312020aml_swc_341111000aml_swc_341011020aml_swc_340922010aml_sta_341615000aml_sta_341511040aml_sta_341410000aml_sta_341311010aml_sta_341114000aml_sta_341111000aml_sta_341010020aml_sta_340912000aml_sta_340911000aml_sdk_341510000aml_sdk_341410000aml_sdk_341110080aml_sdk_341110000aml_sdk_341010000aml_sdk_340912010aml_sch_341510000aml_res_341510000aml_res_341410010aml_res_341311030aml_res_341110000aml_res_340912000aml_per_341614000aml_per_341510010aml_per_341410020aml_per_341311000aml_per_341110020aml_per_341110010aml_per_341011100aml_per_341011020aml_per_340916010aml_odp_341610000aml_neu_341510000aml_neu_341010080aml_neu_341010000aml_net_341610030aml_net_341510050aml_net_341510000aml_net_341411030aml_net_341311010aml_net_341310020aml_net_341111030aml_net_341014000aml_net_340913000aml_mpr_341614010aml_mpr_341511070aml_mpr_341411070aml_mpr_341313030aml_mpr_341111030aml_mpr_341111020aml_mpr_341015090aml_mpr_341015030aml_mpr_340919000aml_med_341619000aml_med_341513600aml_med_341312300aml_med_341312020aml_med_341111000aml_med_341011000aml_med_340922010aml_ips_341611000aml_ips_341510000aml_ips_340914280aml_ips_340914200aml_ips_340914000aml_ext_341620040aml_ext_341518010aml_ext_341414010aml_ext_341317010aml_ext_341131030aml_ext_341027030aml_doc_341610010aml_doc_341510050aml_doc_341312010aml_doc_341112000aml_doc_341012000aml_doc_340916000aml_con_341614000aml_con_341511080aml_con_341410300aml_con_341310090aml_con_341110000aml_cbr_341610000aml_cbr_341510010aml_cbr_341410010aml_cbr_341311010aml_cbr_341110000aml_cbr_341011000aml_cbr_340914000aml_ase_341510000aml_ase_341410000aml_ase_341310010aml_ase_341113000aml_ase_340913000aml_art_341615020aml_art_341514450aml_art_341514410aml_art_341411300aml_art_341311100aml_art_341110110aml_art_341110060aml_art_341010050aml_art_340915060aml_ads_341615050aml_ads_341517040aml_ads_341413000aml_ads_341316030aml_ads_341131050aml_ads_341027030aml_ads_340915050aml_adb_341520010aml_adb_341517070aml_adb_340912530aml_adb_340912350aml_adb_340912200aml_adb_340912000android14-mainline-wifi-releaseandroid14-mainline-uwb-releaseandroid14-mainline-tethering-releaseandroid14-mainline-sdkext-releaseandroid14-mainline-resolv-releaseandroid14-mainline-permission-releaseandroid14-mainline-os-statsd-releaseandroid14-mainline-networking-releaseandroid14-mainline-mediaprovider-releaseandroid14-mainline-media-swcodec-releaseandroid14-mainline-media-releaseandroid14-mainline-extservices-releaseandroid14-mainline-conscrypt-releaseandroid14-mainline-cellbroadcast-releaseandroid14-mainline-art-releaseandroid14-mainline-appsearch-releaseandroid14-mainline-adservices-releaseandroid14-mainline-adbd-releaseMatthew Maurer
f319f4cfbb am: f941cedee4 am: 23aa87e26a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2476444 Change-Id: I6b183daa94851d55f0c41787cd50dfc080ad6f29 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make merge_derive available to product and vendor am: ce3292f0c4 am: ↵android14-devMatthew Maurer
f319f4cfbb am: f941cedee4 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2476444 Change-Id: I8e00dbe2c56c8e90e948497ae9e6bd18297894ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make merge_derive available to product and vendor am: ce3292f0c4 am: f319f4cfbbMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2476444 Change-Id: I19104d683345822bf71f2c39036080a9a953acf7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09Make merge_derive available to product and vendor am: ce3292f0c4android-u-beta-1-gplMatthew Maurer
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2476444 Change-Id: Icae50fd9eff224e7431c6d61869848b4852a3f19 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07Make merge_derive available to product and vendorMatthew Maurer
Bug: 270690570 Test: mma in external/rust/crates Change-Id: I32438b50d1b11f290bc02c22fed67ae774efa083
2022-12-10merge_derive: run cargo2android.py am: 0d03b27568 am: e3be0f2159 am: 8c702f33c0Frederick Mayle
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2338723 Change-Id: Ie07987b8ba25eb3a685e8d9a49c677441931002c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10merge_derive: run cargo2android.py am: 0d03b27568 am: e3be0f2159Frederick Mayle
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2338723 Change-Id: I3df7cefaf25dda2b9503be0ad773de9d05c3decf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-10merge_derive: run cargo2android.py am: 0d03b27568Frederick Mayle
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2338723 Change-Id: I0b6f376b3bd2a5c383eea3acf6ea5ba985067c7e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09merge_derive: run cargo2android.pyplatform-tools-34.0.1platform-tools-34.0.0platform-tools-33.0.4main-16k-with-phonesFrederick Mayle
Bug: 260616729 Test: m merge_derive Change-Id: I93bf2f216d27bceb65aff42b728fd00f34a6b50a
2022-12-09import merge_derive-0.1.0 am: 9e8cac59d9 am: 4cd294328a am: 3edd4a27b1Frederick Mayle
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2336104 Change-Id: I3b624aebb7a529397cdbda4587b17d3869b1edac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09import merge_derive-0.1.0 am: 9e8cac59d9 am: 4cd294328aFrederick Mayle
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2336104 Change-Id: I905e2208aacbf10794122b94909733af0e3ccf6f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-09import merge_derive-0.1.0 am: 9e8cac59d9Frederick Mayle
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/merge_derive/+/2336104 Change-Id: I1429ab845264fcaea17a9b4e53fa210735660176 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-12-08import merge_derive-0.1.0Frederick Mayle
Deleted the non-apache licenses as instructed by android 3p reviewers. Bug: 260616729 Test: n/a Change-Id: Ib9361fcbe0b4de3a36c7ef404705bb5664dfcc37
2022-12-08Initial empty repositoryUmer Abdullah
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-21 17:31:58 +0000