summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 99069084d4 -s ↵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_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010aml_tz3_311312010aml_tet_311811050aml_sdk_311710000aml_pco_311011000aml_mpr_311911090aml_doc_310851020android12-mainline-wifi-releaseandroid12-mainline-tzdata3-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-releaseaml_tz3_314012010Xin Li
ours am: 5d8f1ad8d1 -s ours am: 10e7542910 -s ours am skip reason: Change-Id I2a9b064c190526b7b714f26d1ec34c15c8af589b with SHA-1 cecb8aa418 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ib3332046e09bacaa59ad7139fa7a01a2db258810
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 99069084d4 -s ↵android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-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_r16android12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseXin Li
ours am: 5d8f1ad8d1 -s ours am skip reason: Change-Id I2a9b064c190526b7b714f26d1ec34c15c8af589b with SHA-1 cecb8aa418 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie06520320a20df2d27d2f5f098179dc900c2d19a
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 99069084d4 -s oursXin Li
am skip reason: Change-Id I2a9b064c190526b7b714f26d1ec34c15c8af589b with SHA-1 cecb8aa418 is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2c3a294d55c0311e53d145ec98a120810ddbf997
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1main-cg-testing-releaseandroid-s-beta-4Xin Li
Bug: 180401296 Merged-In: I2a9b064c190526b7b714f26d1ec34c15c8af589b Change-Id: I370bdca8c53f22fe1209d37baf07ebf3d304732b
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/vm_tools/p9 am: 55c6984c1a am: ↵Bob Badour
83828e1a05 am: ab70f96925 am: ff971f4305 Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1588522 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I6e25b6571948ed8650307bba9ea3327b6c282127
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/vm_tools/p9 am: 55c6984c1a am: ↵Bob Badour
83828e1a05 am: ab70f96925 Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1588522 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icafe3575f5b3fad53b283b0433d2c9840c8f3640
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/vm_tools/p9 am: 55c6984c1a am: ↵Bob Badour
83828e1a05 Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1588522 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I7e9107e40110c43540bf20bc32d940bca9b3d037
2021-02-17[LSC] Add LOCAL_LICENSE_KINDS to external/vm_tools/p9 am: 55c6984c1aBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1588522 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I910c3b6633c0e2232abc33faf2b236e7bc6d92a0
2021-02-16[LSC] Add LOCAL_LICENSE_KINDS to external/vm_tools/p9android-s-preview-1Bob Badour
Added SPDX-license-identifier-BSD to: Android.bp wire_format_derive/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: If4e71a32c2297db7e87bcb632404ec362b237211
2021-02-16Clean up rust_test_host TEST_MAPPING after default update am: 022ce5de1f am: ↵Julien Desprez
1ef5dc78fb am: 02393fa221 am: b7c0a221d4 Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1584271 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0e1c870c22edaba79777e8c05c34aed70e14a65d
2021-02-16Clean up rust_test_host TEST_MAPPING after default update am: 022ce5de1f am: ↵Julien Desprez
1ef5dc78fb am: 02393fa221 Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1584271 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idec36559738dd0f46d0d0d61681696d45b2372d1
2021-02-16Clean up rust_test_host TEST_MAPPING after default update am: 022ce5de1f am: ↵Julien Desprez
1ef5dc78fb Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1584271 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Idafff2147f945067d7eaca08202875b845a3f7f0
2021-02-16Clean up rust_test_host TEST_MAPPING after default update am: 022ce5de1fJulien Desprez
Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1584271 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5668d68052efc456154a74d160402b541a67f66f
2021-02-11Clean 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: Ice2cb5725bbd7e3d17c8d58dc0d118f2e1072265 Test: presubmit Bug: 178646865
2021-01-08Fix build on aosp-master/mainline_modules am: c16ad1e384 am: fe08f8eba2 am: ↵Victor Hsieh
b02642ccc7 Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1543579 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic6fdd75cbce7b666af90c6c4aeff88b6dd138a9f
2021-01-08Fix build on aosp-master/mainline_modules am: c16ad1e384 am: fe08f8eba2Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1543579 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I21ffed4134ac61f2a2b7b4aaad3cfdc000a9a617
2021-01-08Fix build on aosp-master/mainline_modules am: c16ad1e384Victor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1543579 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0b4a871ee26e7e8b306331f7a5c5df409823b5bb
2021-01-08Fix build on aosp-master/mainline_modulesplatform-tools-31.0.0Victor Hsieh
Apply the same default as crosvm to avoid inconsistency. libp9 depends on libchromeos. Previous error: error: external/libchromeos-rs/Android.bp:35:1: module "liblibchromeos" variant "linux_bionic_x86_64_rlib_rlib-std": depends on disabled module "libdata_model" Bug: 174797066 Test: build/soong/scripts/build-mainline-modules.sh Change-Id: I997c0a6ae2bd69935de1b0ded066942d1e7a1fa6
2021-01-08Uprev rev vm_tools/p9 to 2c3e8252c684673e83278a0124a998e997dbbcc2 am: ↵Victor Hsieh
8be853418d am: 69e8868888 am: d4b111d1ae Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1518677 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I51c4f3c24cbbe1d8e75d972ba9397eca74b39c78
2021-01-08Uprev rev vm_tools/p9 to 2c3e8252c684673e83278a0124a998e997dbbcc2 am: ↵Victor Hsieh
8be853418d am: 69e8868888 Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1518677 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I0cc4fd59ac2dc7bc45c6e3e301ad4fda9f9a342c
2021-01-08Uprev rev vm_tools/p9 to 2c3e8252c684673e83278a0124a998e997dbbcc2 am: 8be853418dVictor Hsieh
Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1518677 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Iad09587fa4cbe011158f89434c8d82d8a018ca5c
2020-12-15Uprev rev vm_tools/p9 to 2c3e8252c684673e83278a0124a998e997dbbcc2Victor Hsieh
Manual changes: - fuzz/OWNERS: Unrecognized email by Gerrit is commented out, otherwise the Gerrit server rejects the upload. - patches/Android.bp.patch: Add `compile_multilib: 64` to avoid touching disabled, unused 32-bit dependencies. - remove .patch from .gitignore Note that this pulls in more dependnecies: -> libchromeos-rs -> intrusive-collections -> memoffset -> rand_xorshift Bug: 174797066 Test: m Change-Id: I4a810e7b05d8180e80ba15811a66c51d9d069d8d
2020-12-15add crosvm to com.android.virt am: 1a9e872c8b am: 7c9ecf6f6d am: cecb8aa418Jiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1527784 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I16f05b103e2a2520cefb2a26912d74b92cb327b3
2020-12-15add crosvm to com.android.virt am: 1a9e872c8b am: 7c9ecf6f6dJiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1527784 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2a9b064c190526b7b714f26d1ec34c15c8af589b
2020-12-15add crosvm to com.android.virt am: 1a9e872c8bJiyong Park
Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1527784 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I264ef252d3645d87f41f8fdaa4809bfba730fdb0
2020-12-14add crosvm to com.android.virtJiyong Park
To do so, crosvm and its dependencies have the apex_available property set to "//apex_available:platform", "com.android.virt" to explicitly acknowledge the joining. Bug: 174639241 Test: m com.android.virt Change-Id: Id31be39bf7352b73309d64c95d60ffb8c5104036
2020-10-22Add Android.bp files am: 40876dcd90 am: a9efd485f2 am: 591a5f2bff am: 985a34aa57Alistair Delva
Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1468200 Change-Id: Ib6bcacede74771804c111ec428b11ed42fed6dbc
2020-10-22p9: Use std::os::unix rather than std::os::linux. am: 1025034f05 am: ↵Andrew Walbran
036c8e1562 am: 02af803f2c am: 603ff86552 Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1468199 Change-Id: I6ff5981ced304d41a64ccc3c70a5665017a14008
2020-10-22Add Android.bp files am: 40876dcd90 am: a9efd485f2 am: 591a5f2bffAlistair Delva
Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1468200 Change-Id: Id9b713fb2c640e189b8017efab4d22a7a7f9dd24
2020-10-22p9: Use std::os::unix rather than std::os::linux. am: 1025034f05 am: ↵Andrew Walbran
036c8e1562 am: 02af803f2c Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1468199 Change-Id: I449ae9266f5fe049f51c9ac3f0160ab1b4fd288f
2020-10-22Add Android.bp files am: 40876dcd90 am: a9efd485f2Alistair Delva
Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1468200 Change-Id: I96bc1db80ec1d248a80bda4ed04edcf238143fbb
2020-10-22p9: Use std::os::unix rather than std::os::linux. am: 1025034f05 am: 036c8e1562Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1468199 Change-Id: I00db091d20fb55308fbd9ad9fe20cc027916aae8
2020-10-22Add Android.bp files am: 40876dcd90Alistair Delva
Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1468200 Change-Id: Iaa0e93fd83379a468d56e04fda0d130ba1987549
2020-10-22p9: Use std::os::unix rather than std::os::linux. am: 1025034f05Andrew Walbran
Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1468199 Change-Id: I266c85dc6604c04e6c5bafbf79e306dec49a7646
2020-10-22Initial import of p9 rust crate am: 376f07e4cc am: 3416efc4d8 am: 082a1c3c35 ↵Alistair Delva
am: 44a66c1360 Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1468198 Change-Id: Idbcd544fe883ff493f3f53569d46482d6b731c30
2020-10-22Initial import of p9 rust crate am: 376f07e4cc am: 3416efc4d8 am: 082a1c3c35Alistair Delva
Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1468198 Change-Id: Ib4699fa37bae1ce40de9bf60690829f3501ce04a
2020-10-22Initial import of p9 rust crate am: 376f07e4cc am: 3416efc4d8Alistair Delva
Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1468198 Change-Id: I8e492c552698ff66d8342da6da2b99b16f8e919f
2020-10-22Initial import of p9 rust crate am: 376f07e4ccAlistair Delva
Original change: https://android-review.googlesource.com/c/platform/external/vm_tools/p9/+/1468198 Change-Id: I20df2d0d16bbe19a381c72b1cecc4c62a4871856
2020-10-21Add Android.bp filesAlistair Delva
Generated with cargo2android.py and manually edited to disable device-side tests. Bug: 171318426 Change-Id: Icf045c092f5a21dc9b3872aaa1a64421f400b604
2020-10-21p9: Use std::os::unix rather than std::os::linux.Andrew Walbran
This will call out to the appropriate platform, so that it works on Android as well. BUG=b:158290206 TEST=cargo test Link: http://crrev.com/c/2490403 Change-Id: Iaf1c8209a7c721ebcc4a80dc9b2bd1258a5c17d6
2020-10-21Initial import of p9 rust crateAlistair Delva
To support building newer versions of crosvm in AOSP. Bug: 171318426 Change-Id: I12b2b84c32696f4e0f5dfeca32c1bfac67f07f7e
2020-10-20Initial empty repositoryThomas Joseph Avila