aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-06-15Snap for 8730993 from d545c7b569eefe2d12fb5966064f49cacea22669 to ↵aml_tz3_314012070aml_tz3_314012050aml_tz3_314012010aml_tz3_313110000aml_tz3_312511020aml_tz3_312511010aml_tz3_312410020aml_tz3_312410010android12-mainline-tzdata3-releaseaml_tz3_314012010Android Build Coastguard Worker
mainline-tzdata3-release Change-Id: I7c0e3c019e087d75dec5f19e0adbb4ca1e385ad7
2022-05-17Snap for 8603585 from f55f0dd7e46c7c65e0b6cd2924d6ee3b2ee4cee9 to ↵Android Build Coastguard Worker
mainline-tzdata3-release Change-Id: Ie29dc222e9dbfb8bdd6dc02601602f130ce8935c
2022-03-25Merge "Add iproute2 to hwasan-postsubmit" am: 6519b9a8fe am: efbd5baf4d am: ↵aml_tz4_332714070aml_tz4_332714050aml_tz4_332714010aml_tz4_331910000aml_tz4_331314030aml_tz4_331314020aml_tz4_331314010aml_tz4_331012050aml_tz4_331012040aml_tz4_331012000android13-mainline-tzdata4-releaseaml_tz4_332714010Florian Mayer
feb39a2f98 am: 0144e3b1f0 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2032806 Change-Id: I523ed2a46a34671033196a3f80cf534a5cd1c9da Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25Merge "Add iproute2 to hwasan-postsubmit" am: 6519b9a8fe am: efbd5baf4d am: ↵t_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android-t-qpr3-beta-3-gplandroid-t-qpr3-beta-1-gplandroid-t-qpr2-beta-3-gplandroid-t-qpr2-beta-2-gplandroid-13.0.0_r83android-13.0.0_r82android-13.0.0_r81android-13.0.0_r80android-13.0.0_r79android-13.0.0_r78android-13.0.0_r77android-13.0.0_r76android-13.0.0_r75android-13.0.0_r74android-13.0.0_r73android-13.0.0_r72android-13.0.0_r71android-13.0.0_r70android-13.0.0_r69android-13.0.0_r68android-13.0.0_r67android-13.0.0_r66android-13.0.0_r65android-13.0.0_r64android-13.0.0_r63android-13.0.0_r62android-13.0.0_r61android-13.0.0_r60android-13.0.0_r59android-13.0.0_r58android-13.0.0_r57android-13.0.0_r56android-13.0.0_r54android-13.0.0_r53android-13.0.0_r52android-13.0.0_r51android-13.0.0_r50android-13.0.0_r49android-13.0.0_r48android-13.0.0_r47android-13.0.0_r46android-13.0.0_r45android-13.0.0_r44android-13.0.0_r43android-13.0.0_r42android-13.0.0_r41android-13.0.0_r40android-13.0.0_r39android-13.0.0_r38android-13.0.0_r37android-13.0.0_r36android-13.0.0_r35android-13.0.0_r34android-13.0.0_r33android-13.0.0_r32android13-qpr3-s9-releaseandroid13-qpr3-s8-releaseandroid13-qpr3-s7-releaseandroid13-qpr3-s6-releaseandroid13-qpr3-s5-releaseandroid13-qpr3-s4-releaseandroid13-qpr3-s3-releaseandroid13-qpr3-s2-releaseandroid13-qpr3-s14-releaseandroid13-qpr3-s13-releaseandroid13-qpr3-s12-releaseandroid13-qpr3-s11-releaseandroid13-qpr3-s10-releaseandroid13-qpr3-s1-releaseandroid13-qpr3-releaseandroid13-qpr3-c-s8-releaseandroid13-qpr3-c-s7-releaseandroid13-qpr3-c-s6-releaseandroid13-qpr3-c-s5-releaseandroid13-qpr3-c-s4-releaseandroid13-qpr3-c-s3-releaseandroid13-qpr3-c-s2-releaseandroid13-qpr3-c-s12-releaseandroid13-qpr3-c-s11-releaseandroid13-qpr3-c-s10-releaseandroid13-qpr3-c-s1-releaseandroid13-qpr2-s9-releaseandroid13-qpr2-s8-releaseandroid13-qpr2-s7-releaseandroid13-qpr2-s6-releaseandroid13-qpr2-s5-releaseandroid13-qpr2-s3-releaseandroid13-qpr2-s2-releaseandroid13-qpr2-s12-releaseandroid13-qpr2-s11-releaseandroid13-qpr2-s10-releaseandroid13-qpr2-s1-releaseandroid13-qpr2-releaseandroid13-qpr2-b-s1-releaseandroid13-frc-odp-releaseandroid13-devandroid13-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseandroid13-d3-s1-releaseFlorian Mayer
feb39a2f98 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2032806 Change-Id: If191b75e2d09ab936d6dd55689a290a1b61af85e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25Merge "Add iproute2 to hwasan-postsubmit" am: 6519b9a8fe am: efbd5baf4dFlorian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2032806 Change-Id: I18ccfcb270e4c4261b93fed7d8408f4bdd1b9d34 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25Merge "Add iproute2 to hwasan-postsubmit" am: 6519b9a8feFlorian Mayer
Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/2032806 Change-Id: I3165cb68ba8dd6b468f061d3b48f276b74ad8039 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-25Merge "Add iproute2 to hwasan-postsubmit"Florian Mayer
2022-03-18Add iproute2 to hwasan-postsubmitFlorian Mayer
Test: Run tests under HWASan. Bug: 193568145 Change-Id: I1642db89b47544e25d3a151c1e07c4a89d976003
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: b604c84e55 -s ours am: e369cb1196 -s ours am skip reason: Merged-In I94f169ec8e5ee8bd67e1561cdacd3d9bcddba4c2 with SHA-1 ca8d827963 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iproute2/+/16843664 Change-Id: If685040057c923a2a47b44cfe2cd45e009e9ee8d
2022-02-11[automerger skipped] Empty merge of ↵Xin Li
sc-v2-dev-plus-aosp-without-vendor@8084891 am: b604c84e55 -s ours am skip reason: Merged-In I94f169ec8e5ee8bd67e1561cdacd3d9bcddba4c2 with SHA-1 ca8d827963 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iproute2/+/16843664 Change-Id: If789821d87ef8f7ea624ee6ee56a1e5075bdedf7
2022-02-11Empty merge of sc-v2-dev-plus-aosp-without-vendor@8084891Xin Li
Bug: 214455710 Merged-In: I94f169ec8e5ee8bd67e1561cdacd3d9bcddba4c2 Change-Id: I179a95b292b4e63fc8ad24c9fb4de0dfb580348b
2022-02-09Merge "iproute2: switch OWNERS to core networking" am: ca8032262a am: ↵Treehugger Robot
2e9ba5feec am: 6eede43908 am: dac43614e1 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1977011 Change-Id: I234dfaf22f5fda0611fca4bb39407abf47fe5879
2022-02-09Merge "iproute2: switch OWNERS to core networking" am: ca8032262a am: ↵Treehugger Robot
2e9ba5feec am: 6eede43908 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1977011 Change-Id: I4a3c164a5c97e20306390137f172095a38885074
2022-02-09Merge "iproute2: switch OWNERS to core networking" am: ca8032262a am: 2e9ba5feecTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1977011 Change-Id: I8d1ea4a979812902d9620227b8a3c4fde3abc84a
2022-02-09Merge "iproute2: switch OWNERS to core networking" am: ca8032262aTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1977011 Change-Id: I8dbba9316b58e5c99e94c8cab54e8b58b34eb508
2022-02-09Merge "iproute2: switch OWNERS to core networking"android-t-preview-1android-s-v2-beta-3android-t-preview-1android-s-v2-beta-3Treehugger Robot
2022-02-08iproute2: switch OWNERS to core networkingMaciej Żenczykowski
Test: N/A, TreeHugger Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: Ia5bd13f307efdf83d51e3ac19aea0d2d4029a065
2022-02-08Merge "Update cpe for vulnerability scanners" am: dfb09f86fa am: d82065f018 ↵Maciej Żenczykowski
am: 86a0406fdd am: e32f7e1241 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1914268 Change-Id: I4cad3c7e4ac23213086c5c9b7b3ecf046fdb9809
2022-02-08Merge "Update cpe for vulnerability scanners" am: dfb09f86fa am: d82065f018 ↵Maciej Żenczykowski
am: 86a0406fdd Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1914268 Change-Id: I0373fd39f7f87c1936bd054c7b1c832e599faa5f
2022-02-07Merge "Update cpe for vulnerability scanners" am: dfb09f86fa am: d82065f018Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1914268 Change-Id: I0d9dab4f362f0b2bf2bc2f1be31c4b0161887b23
2022-02-07Merge "Update cpe for vulnerability scanners" am: dfb09f86faMaciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1914268 Change-Id: Ia78acb8d16e8c91e77e731328da8f8f06fb6a239
2022-02-07Merge "Update cpe for vulnerability scanners"Maciej Żenczykowski
2022-01-25Merge "Remove libnetdbpf_test from TEST_MAPPING" am: 805766ab69 am: ↵Maciej Żenczykowski
1eedfa7882 am: b4682c479e am: 7601feb472 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1958039 Change-Id: I50df683bfd8b5b260ff7d03f9a1965aec16711c3
2022-01-25Merge "Remove libnetdbpf_test from TEST_MAPPING" am: 805766ab69 am: ↵Maciej Żenczykowski
1eedfa7882 am: b4682c479e Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1958039 Change-Id: I1a6dad33f0ca0c9e290ec569a8634d4ed0ad2755
2022-01-25Merge "Remove libnetdbpf_test from TEST_MAPPING" am: 805766ab69 am: 1eedfa7882Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1958039 Change-Id: I9196fe1fa1a4dc981f3e5c0142104a23df9f5e24
2022-01-25Merge "Remove libnetdbpf_test from TEST_MAPPING" am: 805766ab69Maciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1958039 Change-Id: I3b164749ab21f638a3f7c37600427b2c3c980c17
2022-01-25Merge "Remove libnetdbpf_test from TEST_MAPPING"Maciej Żenczykowski
2022-01-23Remove libnetdbpf_test from TEST_MAPPINGKen Chen
libnetdbpf_test has nothing to do with iproute2 Bug: 202086915 Test: m Change-Id: Iaaaeb4f7aa26cd744265573cc6f39582d384e5d6
2022-01-12Update cpe for vulnerability scannersMaria Uretsky
Bug: http://b/201572953 Change-Id: Id1bc9e9f1dab61f9e26902e817d1718e95d3fc4a
2021-06-03[automerger skipped] Enable Async MTE in iproute2. am: ca8d827963 am: ↵Evgenii Stepanov
d545c7b569 -s ours am skip reason: Merged-In I94f169ec8e5ee8bd67e1561cdacd3d9bcddba4c2 with SHA-1 ca8d827963 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iproute2/+/14793303 Change-Id: Ifd5c9abf950280cc2001955d3c0c65c8c95b1663
2021-06-02[automerger skipped] Enable Async MTE in iproute2. am: ca8d827963 -s ours ↵Evgenii Stepanov
am: 5fa7fcb794 -s ours am: d1e0fc7ef6 -s ours am skip reason: Merged-In I94f169ec8e5ee8bd67e1561cdacd3d9bcddba4c2 with SHA-1 ca8d827963 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iproute2/+/14793303 Change-Id: I46a99445f4a6f9ecb84579b69542e56f82451bf1
2021-06-02[automerger skipped] Enable Async MTE in iproute2. am: ca8d827963 -s ours ↵Evgenii Stepanov
am: 5fa7fcb794 -s ours am skip reason: Merged-In I94f169ec8e5ee8bd67e1561cdacd3d9bcddba4c2 with SHA-1 ca8d827963 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iproute2/+/14793303 Change-Id: I6d933fa27fa8e11b7c320882f2d83d370c897df6
2021-06-02[automerger skipped] Enable Async MTE in iproute2. am: ca8d827963 am: ↵Evgenii Stepanov
294c0f6b68 -s ours am: f4a599d7b9 -s ours am skip reason: Merged-In I94f169ec8e5ee8bd67e1561cdacd3d9bcddba4c2 with SHA-1 722d9b16de is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iproute2/+/14793303 Change-Id: Id3cd99e5dfe4a3baff0336a5dcba1c993f9cad30
2021-06-02[automerger skipped] Enable Async MTE in iproute2. am: ca8d827963 am: ↵Evgenii Stepanov
294c0f6b68 -s ours am skip reason: Merged-In I94f169ec8e5ee8bd67e1561cdacd3d9bcddba4c2 with SHA-1 722d9b16de is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iproute2/+/14793303 Change-Id: Ia66cd4404bfde8745b8178f658e222ae77d8769c
2021-06-02Enable Async MTE in iproute2. am: ca8d827963android-s-qpr3-beta-1android-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_r10android12L-devandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid-s-qpr3-beta-1Evgenii Stepanov
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iproute2/+/14793303 Change-Id: Ib74d834989e15fb4d4b9a13ae5ba6df7aa486c07
2021-06-02[automerger skipped] Enable Async MTE in iproute2. am: ca8d827963 -s oursandroid-s-v2-preview-1android-s-v2-preview-1Evgenii Stepanov
am skip reason: Merged-In I94f169ec8e5ee8bd67e1561cdacd3d9bcddba4c2 with SHA-1 722d9b16de is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iproute2/+/14793303 Change-Id: I1e14cc24cedbad3ceebf87b61b51de78feeef990
2021-06-02Enable Async MTE in iproute2. am: ca8d827963android-mainline-12.0.0_r99android-mainline-12.0.0_r98android-mainline-12.0.0_r77android-mainline-12.0.0_r70android-mainline-12.0.0_r69android-mainline-12.0.0_r63android-mainline-12.0.0_r59android-mainline-12.0.0_r56android-mainline-12.0.0_r5android-mainline-12.0.0_r49android-mainline-12.0.0_r42android-mainline-12.0.0_r39android-mainline-12.0.0_r22android-mainline-12.0.0_r19android-mainline-12.0.0_r122android-mainline-12.0.0_r115android-mainline-12.0.0_r113android-mainline-12.0.0_r100aml_tz3_311312010android12-mainline-networkstack-releaseandroid12-mainline-art-releaseEvgenii Stepanov
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/iproute2/+/14793303 Change-Id: I28f824b3329e879bd1a6712a1e70fb4a3adf837a
2021-06-01Enable Async MTE in iproute2.android-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-devEvgenii Stepanov
This change enables Async mode ARM MTE in iproute2 utils on compatible hardware and has no effect otherwise. Bug: 181603044 Test: atest under system/netd/tests Change-Id: I94f169ec8e5ee8bd67e1561cdacd3d9bcddba4c2 Merged-In: I94f169ec8e5ee8bd67e1561cdacd3d9bcddba4c2 (cherry picked from commit 722d9b16de024e5184547a17d432d5598da6f41a)
2021-05-27Merge sc-mainline-prod to master.Bill Rassieur
Change-Id: Icd54f1f7d96e20c18d38413dd7d86834d94ce76c
2021-05-22Merge "Enable Async MTE in iproute2." am: 501dbe0153 am: 5d0149a3e1 am: ↵Treehugger Robot
0774de515b am: f774919e66 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1715930 Change-Id: I40ac2d9f8c11806c774fce1053eadc41739ea9bf
2021-05-22Merge "Enable Async MTE in iproute2." am: 501dbe0153 am: 5d0149a3e1 am: ↵Treehugger Robot
0774de515b Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1715930 Change-Id: Id73e8ef82cca6f3dae763bba07b3202906f528d7
2021-05-22Merge "Enable Async MTE in iproute2." am: 501dbe0153 am: 5d0149a3e1Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1715930 Change-Id: I095e09ea59e014bb6193d98747bc3cc24138a72e
2021-05-22Merge "Enable Async MTE in iproute2." am: 501dbe0153android-s-beta-5android-s-beta-5Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1715930 Change-Id: Ie805daf9580f4741b45393ac5fea06a6899d1fa3
2021-05-22Merge "Enable Async MTE in iproute2."Treehugger Robot
2021-05-21Enable Async MTE in iproute2.Evgenii Stepanov
This change enables Async mode ARM MTE in iproute2 utils on compatible hardware and has no effect otherwise. Bug: 181603044 Test: atest under system/netd/tests Change-Id: I94f169ec8e5ee8bd67e1561cdacd3d9bcddba4c2
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iproute2" am: 1799e9ce3b ↵Bob Badour
am: 8612147955 am: 96a83bb89c am: 29ebe57f97 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1588873 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie68136b00becea21372acf3fd301b9681c9f7a56
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iproute2" am: 1799e9ce3b ↵Bob Badour
am: 8612147955 am: 96a83bb89c am: 29ebe57f97 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1588873 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1c17c9d4a969d01503fd64e30f040107f76ffe3b
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iproute2" am: 1799e9ce3b ↵Bob Badour
am: 8612147955 am: 96a83bb89c Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1588873 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I80aa90196682f9ccf98471b41972b07cc9d0622d
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iproute2" am: 1799e9ce3b ↵Bob Badour
am: 8612147955 Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1588873 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I5afbbec4520c5cb8ecdc2cdbd84c40a5512bcf36
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iproute2" am: 1799e9ce3bandroid-s-beta-2android-s-beta-1Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/iproute2/+/1588873 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ic65edc8f0a302b7e613b306393dbfeebd8bfc08b
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 18:02:18 +0000