aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-04-28Generate apex_available from c2a instead of a patch am: d015e3b253 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-releaseJoel Galenson
bde10a187a am: fc91b0f148 am: e2a98307c4 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1689360 Change-Id: I9608ad8f15bda2a3e5b5074af9b7207ec8c26184
2021-04-28Generate apex_available from c2a instead of a patch am: d015e3b253 am: ↵android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-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-devandroid12-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-devJoel Galenson
bde10a187a am: fc91b0f148 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1689360 Change-Id: I3b949ced1eb2dd6a7399379543a39a87a04f1b69
2021-04-28Generate apex_available from c2a instead of a patch am: d015e3b253 am: ↵Joel Galenson
bde10a187a Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1689360 Change-Id: I64030cff78562f3c4692e153f26b10452ec45891
2021-04-28Generate apex_available from c2a instead of a patch am: d015e3b253Joel Galenson
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1689360 Change-Id: If0d3196cf102f6c6a2f66c8163dd9402af971208
2021-04-28Generate apex_available from c2a instead of a patchandroid-s-beta-2android-s-beta-1Joel Galenson
Test: Run c2a Test: Build Change-Id: Iae2c061789fab862e6b573b66950e34756aa35e3
2021-03-23Merge "Upgrade rust/crates/serde_json to 1.0.62" am: c1f979a6e9 am: ↵Treehugger Robot
8e7fc59742 am: da48820dc5 am: 3460fdd5d7 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1582271 Change-Id: I826dceec527f7160e16963dd592089640d50c6e4
2021-03-22Merge "Upgrade rust/crates/serde_json to 1.0.62" am: c1f979a6e9 am: ↵Treehugger Robot
8e7fc59742 am: da48820dc5 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1582271 Change-Id: I9c1e0db36ccc774b4fc356daa914142def2c96cd
2021-03-22Merge "Upgrade rust/crates/serde_json to 1.0.62" am: c1f979a6e9 am: 8e7fc59742Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1582271 Change-Id: I0ff9888aaf30a8e0fd7f754b0824892a88cc7c2b
2021-03-22Merge "Upgrade rust/crates/serde_json to 1.0.62" am: c1f979a6e9Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1582271 Change-Id: I02159fcf9633e868d91c96710eb1ec9d8c8f4135
2021-03-22Merge "Upgrade rust/crates/serde_json to 1.0.62"Treehugger Robot
2021-02-22Merge "Add virtmanager to the virt APEX" am: 2ed40b25a2 am: 230d7d695b am: ↵Treehugger Robot
8f2100b5e5 am: b580018cc3 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1589298 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If50aad6330610848bad150c5cb980886fb759f83
2021-02-22Merge "Add virtmanager to the virt APEX" am: 2ed40b25a2 am: 230d7d695b am: ↵Treehugger Robot
8f2100b5e5 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1589298 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1cce852105bec1aa5d1935f29c01c0e61136b3c4
2021-02-22Merge "Add virtmanager to the virt APEX" am: 2ed40b25a2 am: 230d7d695bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1589298 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id8d91170199c9138645dfdeadf0831f55118890d
2021-02-22Merge "Add virtmanager to the virt APEX" am: 2ed40b25a2Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1589298 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I8b7592c3dd2dc298dc2fe458fad7c096dade61b0
2021-02-22Merge "Add virtmanager to the virt APEX"Treehugger Robot
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 4b9aecb29d -s ↵Xin Li
ours am: eb71c4f752 -s ours am: 3e70a6026c -s ours am skip reason: Change-Id I00bcb703207a4b0d1e784836324559504706e5d5 with SHA-1 1006d72f8f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ieb90abf99751374fc1e38a474127589708c95009
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 4b9aecb29d -s ↵Xin Li
ours am: eb71c4f752 -s ours am skip reason: Change-Id I00bcb703207a4b0d1e784836324559504706e5d5 with SHA-1 1006d72f8f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I522bfb6f9e818b6f4989f001ca480c453b534d00
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 4b9aecb29d -s oursXin Li
am skip reason: Change-Id I00bcb703207a4b0d1e784836324559504706e5d5 with SHA-1 1006d72f8f is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I50546b5b4e225d9688520621601a2aa1b6e3831d
2021-02-20Mark ab/7061308 as merged in stage.Xin Li
Bug: 180401296 Merged-In: I00bcb703207a4b0d1e784836324559504706e5d5 Change-Id: I68dbbb6025e6004153e4a780fba8a3efc98a62ae
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/serde_json am: ↵Bob Badour
9f74f22d44 am: bf25f1c754 am: 501495d27b am: db7888b964 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1588670 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: If1bdd6f67caab90fc3a0d6fe80247f135e0b3726
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/serde_json am: ↵Bob Badour
9f74f22d44 am: bf25f1c754 am: 501495d27b Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1588670 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie052686b0f83b2c661e4fe8e6cd26917f5740b23
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/serde_json am: ↵Bob Badour
9f74f22d44 am: bf25f1c754 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1588670 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ieec3717f91217b80d1666eee57de39e0bc9150f1
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/serde_json am: 9f74f22d44Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1588670 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I840ddf98fb94a7fe83013a411e48ae3c1b9dce22
2021-02-16Add virtmanager to the virt APEXJiyong Park
We want to have virtmanager (and its dependencies) inside the APEX so that they can be updated. This library is a dependency of the binary, therefore it should also be marked as being available to the APEX. Bug: 180297657 Test: com.android.virt Change-Id: I3fa879c630e42ef481d37f5f213103688251a23d
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/rust/crates/serde_jsonandroid-s-preview-1Bob 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: Ifaf2a7f107c30c54a54689637ff2134a6511483e
2021-02-09Upgrade rust/crates/serde_json to 1.0.62Haibo Huang
Test: make Change-Id: I8537c46c6f2e10021577f11a863e246356ce50ba
2021-01-05Upgrade rust/crates/serde_json to 1.0.61 am: b38d84b461 am: c14c085a2b am: ↵Haibo Huang
7a64833c3c Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1537191 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I93993830f4c0f1fa20a377d6010713a1e5382d8c
2021-01-05Upgrade rust/crates/serde_json to 1.0.61 am: b38d84b461 am: c14c085a2bHaibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1537191 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie2ca5bc25cf9ff75e4ebe5dd7d59dd0a7f54152c
2021-01-05Upgrade rust/crates/serde_json to 1.0.61 am: b38d84b461Haibo Huang
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1537191 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icd1609fcc7dfc0a57275c79614e14225aadb02f4
2020-12-29Upgrade rust/crates/serde_json to 1.0.61Haibo Huang
Test: make Change-Id: I3d0b5e60245a101a2c0ba17d2b2982f9c820ce7e
2020-11-25Mark ab/6881855 as merged am: e1f7119b92 am: 1006d72f8fXin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/13109971 Change-Id: I609881fad25dc8ac086f67bde18dfb75ac5ad9c8
2020-11-25Mark ab/6881855 as merged am: e1f7119b92Xin Li
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/13109971 Change-Id: I00bcb703207a4b0d1e784836324559504706e5d5
2020-11-23Mark ab/6881855 as mergedXin Li
Bug: 172690556 Change-Id: I7f5384dce5314c44ed3c125f4e5a0941824bc776
2020-10-28Upgrade rust/crates/serde_json to 1.0.59 am: b93bfcba9d am: 6fafb12b60 am: ↵Chih-Hung Hsieh
10d8635372 am: 39ed335fc6 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1474963 Change-Id: I04f825b352a669b3356ddf687b3321c75510585f
2020-10-28Upgrade rust/crates/serde_json to 1.0.59 am: b93bfcba9d am: 6fafb12b60 am: ↵Chih-Hung Hsieh
10d8635372 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1474963 Change-Id: Ic620c3ee690cfeef3c44c679f3d3e5ec3045c19f
2020-10-28Upgrade rust/crates/serde_json to 1.0.59 am: b93bfcba9d am: 6fafb12b60Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1474963 Change-Id: I90a3b39551f253aa2a438f3c6d580a03a11c430b
2020-10-28Upgrade rust/crates/serde_json to 1.0.59 am: b93bfcba9dChih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1474963 Change-Id: I4ddf11f76eafcf21c9f25f83a890e008926f5a38
2020-10-26Upgrade rust/crates/serde_json to 1.0.59Chih-Hung Hsieh
Test: make Change-Id: I4bea1b55837c5667419f03ff562973006381e613
2020-10-12Copy description from Cargo.toml to METADATA am: 6128c69f36 am: aa0f7330b2 ↵Chih-Hung Hsieh
am: 17e30cd648 am: 1cc1ce8c1d Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1457195 Change-Id: Ife41416c898dc3a94c9df33e2545341477e898ea
2020-10-12Copy description from Cargo.toml to METADATA am: 6128c69f36 am: aa0f7330b2 ↵Chih-Hung Hsieh
am: 17e30cd648 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1457195 Change-Id: Ieac10147c4ee3698f9c20337c4027a8c81997ea2
2020-10-12Copy description from Cargo.toml to METADATA am: 6128c69f36 am: aa0f7330b2Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1457195 Change-Id: Ic6ccda822ab5b4784a60893eeff19cd1c77ab8da
2020-10-12Copy description from Cargo.toml to METADATA am: 6128c69f36Chih-Hung Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1457195 Change-Id: I69fe60d1f0691a63fa51ac5fcc1a51ef1508472e
2020-10-12Copy description from Cargo.toml to METADATAChih-Hung Hsieh
Test: make Change-Id: I4b5d7efbbb84956accd01ffd563ae3a410db7a4c
2020-09-01Import 'serde_json' crate version 1.0.57 am: d600cb0f78 am: 18e4a244a1 am: ↵Yi Kong
94ef60b2a7 am: 4190f2ff60 am: 632fda07ae Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1414670 Change-Id: Ic0a1a5527761954fd2a47a613634060e239b4409
2020-09-01Import 'serde_json' crate version 1.0.57 am: d600cb0f78 am: 18e4a244a1 am: ↵Yi Kong
94ef60b2a7 am: 4190f2ff60 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1414670 Change-Id: I7c00afd0dbde494e7cef6227a294d3b58ba5efdb
2020-09-01Import 'serde_json' crate version 1.0.57 am: d600cb0f78 am: 18e4a244a1 am: ↵Yi Kong
94ef60b2a7 Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1414670 Change-Id: Ide0d14eaa1e484c0ff38d63400fd09b36cb8a6f9
2020-09-01Import 'serde_json' crate version 1.0.57 am: d600cb0f78 am: 18e4a244a1Yi Kong
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1414670 Change-Id: Ie76ea0117e29012f9014a5ba2a18f66aace05b71
2020-09-01Import 'serde_json' crate version 1.0.57 am: d600cb0f78platform-tools-30.0.5Yi Kong
Original change: https://android-review.googlesource.com/c/platform/external/rust/crates/serde_json/+/1414670 Change-Id: I6d3e309e5adf8ca39c6a0c38dc0cb9485722a3c6
2020-08-31Import 'serde_json' crate version 1.0.57Yi Kong
Bug: 163175424 Test: N/A Change-Id: I8e665db0617be60a7e3732acd21d33ddbbf7cefd
2020-08-26Initial empty repositoryInna Palant