aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
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-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
2021-02-17Merge "[LSC] Add LOCAL_LICENSE_KINDS to external/iproute2"android-s-preview-1Bob Badour
2021-02-12[LSC] Add LOCAL_LICENSE_KINDS to external/iproute2Bob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-GPL-3.0 SPDX-license-identifier-LGPL to: tc/Android.bp Added SPDX-license-identifier-BSD SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-GPL-3.0 SPDX-license-identifier-LGPL legacy_unencumbered to: Android.bp Added SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 to: misc/Android.bp Added SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL to: lib/Android.bp Added SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0 SPDX-license-identifier-LGPL legacy_unencumbered to: ip/Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: I22cbc120a859b4fe62607cd43d8c6b4931e95518
2020-04-30Merge "Add METADATA to iproute2: GPL=RESTRICTED" am: 7c3c47da47 am: ↵Maciej Żenczykowski
d6e38af5a7 am: 2e8f6ce8ab am: c7ea3cd1e1 am: 1b09a3d006 Change-Id: I7e770781c9d9d2666a7666c13a24a2fc0f2528f2
2020-04-30Merge "Add METADATA to iproute2: GPL=RESTRICTED" am: 7c3c47da47 am: ↵Maciej Żenczykowski
d6e38af5a7 am: 2e8f6ce8ab am: c7ea3cd1e1 Change-Id: I24d7fd5851ae9040b63486d3e77983e07c0c305b
2020-04-30Merge "Add METADATA to iproute2: GPL=RESTRICTED" am: 7c3c47da47 am: ↵Maciej Żenczykowski
d6e38af5a7 am: 2e8f6ce8ab Change-Id: Ibeb5e57fb110c1c21993e59237d8fd27986fe6c6
2020-04-30Merge "Add METADATA to iproute2: GPL=RESTRICTED" am: 7c3c47da47 am: d6e38af5a7Maciej Żenczykowski
Change-Id: Ib353c85e5139e9cfc9b47a202529a6d376c473d3
2020-04-30Merge "Add METADATA to iproute2: GPL=RESTRICTED" am: 7c3c47da47Maciej Żenczykowski
Change-Id: I339ea8420e6977383776b7f2c6df493d00220e05
2020-04-30Merge "Add METADATA to iproute2: GPL=RESTRICTED"Maciej Żenczykowski
2020-04-28Add METADATA to iproute2: GPL=RESTRICTEDBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ifac1327a66fd83a3ba3242755ef583f0a90b2906
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 0c99e26e4d -s ours am: 121f9642f9 am: 4be78b6e1a am: 39aeea7f58 -s ours am skip reason: subject contains skip directive Change-Id: I142b473fc9e0fe41bb4a635ef66bc3e5424e7d8f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 0c99e26e4d -s ours am: 121f9642f9 am: 4be78b6e1a Change-Id: I99ed571257ca79d7465f3b7f3bc7d067c3cc10c5
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 0c99e26e4d -s ours am: 121f9642f9 Change-Id: I353c297c67a5be4c480478acc549be2c03adc864
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: 0c99e26e4d -s ours am skip reason: subject contains skip directive Change-Id: Iec264fe732a5028e4ed54d5fe9e3850a109b0f56
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Iae65c0de202a7794a78400e4e6409fb30469cc80
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: ce804106b6 -s ours am: 342e0d178f am: be6bdaa223 am: 385c273f43 -s ours am skip reason: subject contains skip directive Change-Id: I20f9e21401ed0c8ca3547f83517bc39a0be13456
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: ce804106b6 -s ours am: 342e0d178f am: be6bdaa223 Change-Id: Ia017dcd47ff204f62bde0485cd0dd4cd42f7ecc6
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: ce804106b6 -s ours am: 342e0d178f Change-Id: Id5e1045158b766136eb0603f9466113da7afd7c5
2020-03-19DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into ↵Xin Li
stag-aosp-master am: ce804106b6 Change-Id: I5ac9d9fb8dd16b4db0659fceb350f4af3d3fb686
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: ce804106b6 -s ours am skip reason: subject contains skip directive Change-Id: I9f9fe4984e1d19b6360205dd92383f4b9215bee9
2020-03-18DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: Iadec0d4e064098802cd0ca0f9002e3af58e18a0b
2020-01-24Merge "ANDROID: Fix 32-bit x86 iproute2 on 64-bit kernel" am: 68454405a4 am: ↵r_aml_301500702android-mainline-12.0.0_r55android-mainline-11.0.0_r9android-mainline-11.0.0_r8android-mainline-11.0.0_r7android-mainline-11.0.0_r6android-mainline-11.0.0_r5android-mainline-11.0.0_r45android-mainline-11.0.0_r44android-mainline-11.0.0_r43android-mainline-11.0.0_r42android-mainline-11.0.0_r41android-mainline-11.0.0_r40android-mainline-11.0.0_r4android-mainline-11.0.0_r39android-mainline-11.0.0_r38android-mainline-11.0.0_r37android-mainline-11.0.0_r36android-mainline-11.0.0_r35android-mainline-11.0.0_r34android-mainline-11.0.0_r33android-mainline-11.0.0_r32android-mainline-11.0.0_r31android-mainline-11.0.0_r30android-mainline-11.0.0_r3android-mainline-11.0.0_r29android-mainline-11.0.0_r28android-mainline-11.0.0_r27android-mainline-11.0.0_r26android-mainline-11.0.0_r25android-mainline-11.0.0_r24android-mainline-11.0.0_r23android-mainline-11.0.0_r22android-mainline-11.0.0_r21android-mainline-11.0.0_r20android-mainline-11.0.0_r2android-mainline-11.0.0_r19android-mainline-11.0.0_r18android-mainline-11.0.0_r17android-mainline-11.0.0_r16android-mainline-11.0.0_r15android-mainline-11.0.0_r14android-mainline-11.0.0_r13android-mainline-11.0.0_r12android-mainline-11.0.0_r10android-mainline-11.0.0_r1android-11.0.0_r9android-11.0.0_r8android-11.0.0_r7android-11.0.0_r48android-11.0.0_r47android-11.0.0_r46android-11.0.0_r45android-11.0.0_r44android-11.0.0_r43android-11.0.0_r42android-11.0.0_r41android-11.0.0_r40android-11.0.0_r39android-11.0.0_r38android-11.0.0_r37android-11.0.0_r36android-11.0.0_r35android-11.0.0_r34android-11.0.0_r33android-11.0.0_r32android-11.0.0_r31android-11.0.0_r30android-11.0.0_r29android-11.0.0_r28android-11.0.0_r27android-11.0.0_r26android-11.0.0_r24android-11.0.0_r23android-11.0.0_r22android-11.0.0_r21android-11.0.0_r20android-11.0.0_r19android-11.0.0_r18android-11.0.0_r16android-11.0.0_r15android-11.0.0_r14android-11.0.0_r13android-11.0.0_r12android-11.0.0_r11android-11.0.0_r10android11-qpr3-s1-releaseandroid11-qpr3-releaseandroid11-qpr2-releaseandroid11-qpr1-s2-releaseandroid11-qpr1-s1-releaseandroid11-qpr1-releaseandroid11-qpr1-d-s1-releaseandroid11-qpr1-d-releaseandroid11-qpr1-c-releaseandroid11-mainline-tethering-releaseandroid11-mainline-sparse-2021-jan-releaseandroid11-mainline-sparse-2020-dec-releaseandroid11-mainline-releaseandroid11-mainline-permission-releaseandroid11-mainline-os-statsd-releaseandroid11-mainline-networkstack-releaseandroid11-mainline-media-swcodec-releaseandroid11-mainline-media-releaseandroid11-mainline-extservices-releaseandroid11-mainline-documentsui-releaseandroid11-mainline-conscrypt-releaseandroid11-mainline-cellbroadcast-releaseandroid11-mainline-captiveportallogin-releaseandroid11-devandroid11-d2-releaseandroid11-d1-s7-releaseandroid11-d1-s6-releaseandroid11-d1-s5-releaseandroid11-d1-s1-releaseandroid11-d1-releaseandroid11-d1-b-releaseAutomerger Merge Worker
cd4884e9d6 am: a49f6aaa53 Change-Id: Ifde7908cd3e411a3ba7d46ab24a8c75adbceecfe
2020-01-24Merge "ANDROID: Fix 32-bit x86 iproute2 on 64-bit kernel" am: 68454405a4 am: ↵Automerger Merge Worker
cd4884e9d6 Change-Id: I22e6aae3e0f86306dbda890b893ef240867b1da3
2020-01-24Merge "ANDROID: Fix 32-bit x86 iproute2 on 64-bit kernel" am: 68454405a4Automerger Merge Worker
Change-Id: I69618b3962cb149d14724d0ef07035bd2f563734
2020-01-24Merge "ANDROID: Fix 32-bit x86 iproute2 on 64-bit kernel"Maciej Żenczykowski
2020-01-21ANDROID: Fix 32-bit x86 iproute2 on 64-bit kernelAlistair Delva
Fix VtsKernelNetTest / xfrm_test.XfrmFunctionalTest testAddSa and other system users of iproute2 binaries on 32-bit x86 userspaces. The upstream XFRM netlink interface does not use packed structures, so it depends on architecture-specific alignment of XFRM structures. In upstream kernels, the workaround was to disallow 32-bit applications to use this netlink interface on 64-bit kernels, but on Android we want to support this, and so the check was removed from the kernel. Other changes had already been made to netd and various C++ unittests to mitigate this incompatibility, however these workarounds were not applied / cannot work with the C binaries from the iproute2 package. Apply the same workaround again here. NOTE: This explicitly breaks running iproute2 on a 32-bit x86 kernel. However, we don't think this will affect any device in the Android ecosystem. Bug: 138147164 Change-Id: Ibc6aa966f7f114d75c46078e5675ba2a44836a7d
2019-06-13Merge "Attempt to run netd tests when iproute2 is modified." am: de0e714027 ↵Lorenzo Colitti
am: 8d9535a6c5 am: 5765a40a00 am: ab7379dd97 Change-Id: Iaa9c8aa8e4c21bf333e155e8138b643b87d048ee
2019-06-13Merge "Attempt to run netd tests when iproute2 is modified." am: de0e714027 ↵android-mainline-10.0.0_r8android-mainline-10.0.0_r6android10-mainline-resolv-releaseandroid10-mainline-networking-releaseLorenzo Colitti
am: 8d9535a6c5 am: 5765a40a00 Change-Id: I2da2f17835638b0f8ffb13d74e100c52640e16a3
2019-06-13Merge "Attempt to run netd tests when iproute2 is modified." am: de0e714027ndk-sysroot-r21Lorenzo Colitti
am: 8d9535a6c5 Change-Id: I6145ca12d4f079cad408211c795380677470c8b3
2019-06-13Merge "Attempt to run netd tests when iproute2 is modified."Lorenzo Colitti
am: de0e714027 Change-Id: I33cbef3948ef536d4847d78ed76dbce5a0a7209f
2019-06-14Merge "Attempt to run netd tests when iproute2 is modified."Treehugger Robot
2019-06-13Attempt to run netd tests when iproute2 is modified.Lorenzo Colitti
Bug: 134441670 Test: treehugger Change-Id: I7c8b64c36531f6eda46ef97820cc0416d7d8bd76
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospandroid-mainline-10.0.0_r9android-mainline-10.0.0_r7android-mainline-10.0.0_r5android-mainline-10.0.0_r4android-mainline-10.0.0_r10android-10.0.0_r9android-10.0.0_r8android-10.0.0_r7android-10.0.0_r45android-10.0.0_r44android-10.0.0_r43android-10.0.0_r42android-10.0.0_r41android-10.0.0_r40android-10.0.0_r39android-10.0.0_r38android-10.0.0_r37android-10.0.0_r36android-10.0.0_r35android-10.0.0_r34android-10.0.0_r33android-10.0.0_r32android-10.0.0_r31android-10.0.0_r30android-10.0.0_r29android-10.0.0_r28android-10.0.0_r27android-10.0.0_r26android-10.0.0_r25android-10.0.0_r24android-10.0.0_r23android-10.0.0_r22android-10.0.0_r21android-10.0.0_r20android-10.0.0_r19android-10.0.0_r18android-10.0.0_r16android-10.0.0_r15android-10.0.0_r14android-10.0.0_r13android-10.0.0_r12android10-qpr3-s1-releaseandroid10-qpr3-releaseandroid10-qpr2-s4-releaseandroid10-qpr2-s3-releaseandroid10-qpr2-s2-releaseandroid10-qpr2-s1-releaseandroid10-qpr2-releaseandroid10-qpr1-releaseandroid10-qpr1-mainline-releaseandroid10-qpr1-d-releaseandroid10-qpr1-c-s1-releaseandroid10-qpr1-c-releaseandroid10-qpr1-b-s1-releaseandroid10-qpr1-b-releaseandroid10-mainline-media-releaseandroid10-devandroid10-d4-s1-releaseandroid10-d4-releaseandroid10-c2f2-s2-releaseandroid10-c2f2-s1-releaseandroid10-c2f2-releaseXin Li
am: 9c7e0abee3 Change-Id: I33c1d0b2a151119bd3f4e0eaae4b38fcaaa2fcaa
2019-02-25Merge stage-aosp-master into pi-dev-plus-aospXin Li
Bug: 126125118 Change-Id: I09d14fc2a01c08a9fd10e6030fd8720b20e34014
2019-02-20DO NOT MERGE - Merge pi-dev@5234907 into stage-aosp-masterXin Li
Bug: 120848293 Change-Id: Ia237183637cd6ba3d1da2954ac1bb8c195105b13
2019-01-28Merge "iproute2: remove ek, add satk to OWNERS" am: f3a8012094 am: eecc645a30Maciej Żenczykowski
am: 715492c6fb Change-Id: I87614aada42ab4891b4c39941f1f2168fd8c2682
2019-01-28Merge "iproute2: remove ek, add satk to OWNERS" am: f3a8012094Maciej Żenczykowski
am: eecc645a30 Change-Id: I0019d58b46a7f28c4d63d70b8d933a6f94ffc0c5
2019-01-28Merge "iproute2: remove ek, add satk to OWNERS"Maciej Żenczykowski
am: f3a8012094 Change-Id: I1caf7e1ca24f3439613c7938d17cbed78989d4b6
2019-01-28Merge "iproute2: remove ek, add satk to OWNERS"Treehugger Robot
2019-01-28Merge changes I0af6a8c1,Ia77fd91e,Ib26b3167,Ic6e7afd9,I58752686 am: ↵Maciej Żenczykowski
90a033c688 am: d44aa8b9cc am: ea4d1ebf3c Change-Id: I2bf3af4100f3db950567f8f8d50925fbf2402a02
2019-01-28Merge changes I0af6a8c1,Ia77fd91e,Ib26b3167,Ic6e7afd9,I58752686 am: 90a033c688Maciej Żenczykowski
am: d44aa8b9cc Change-Id: I2e1420e1d966413a10cac0aaa347e816a98a2b40
2019-01-28Merge changes I0af6a8c1,Ia77fd91e,Ib26b3167,Ic6e7afd9,I58752686Maciej Żenczykowski
am: 90a033c688 Change-Id: I566d008bb849f4b72031ae1f845ba624298a41f0
2019-01-28Merge "iproute2: add maze to OWNERS" am: bfde7e0d24 am: 1316271023Maciej Żenczykowski
am: 9edf224c24 Change-Id: I808f9078ad9876519e44688098e62eb3f70a325b
2019-01-28iproute2: remove ek, add satk to OWNERSMaciej Żenczykowski
Signed-off-by: Maciej Żenczykowski <maze@google.com> Change-Id: I22f83786212e43961d35ee7cebaaa93fdd4c76b8
2019-01-28Merge "iproute2: add maze to OWNERS" am: bfde7e0d24Maciej Żenczykowski
am: 1316271023 Change-Id: I53587ec02e1385fc76fa0d7a0a07151b94cd3e82
2019-01-28Merge changes I0af6a8c1,Ia77fd91e,Ib26b3167,Ic6e7afd9,I58752686Maciej Żenczykowski
* changes: iproute2: static compile. iproute2: support more qdiscs iproute2: support filters besides u32 iproute2: support actions besides mirred iproute2: re-enable batching
2019-01-27Merge "iproute2: add maze to OWNERS"Maciej Żenczykowski
am: bfde7e0d24 Change-Id: Idd122e9daaa111d583958b8975ab39c2a7981ca5
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-16 21:21:59 +0000