summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2024-02-03Merge "Snap for 11400057 from 436e52284b6f948058609e345b0500e7fa2fa024 to ↵simpleperf-releaseAndroid Build Coastguard Worker
simpleperf-release" into simpleperf-release
2024-02-02Snap for 11400057 from 436e52284b6f948058609e345b0500e7fa2fa024 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I69a9994a5d897fb00fdc65b698f28168b440d284
2023-12-15Merge "Remove ppp" into mainHansen Kurli
2023-11-21Remove pppHansen Kurli
Legacy VPNs are now removed. Bug: 161776767 Test: m Change-Id: I3935f91a705b912adff30856cf07f36abdd3688b
2023-10-16Merge "Snap for 10957012 from e50a3e2077ede6a35cc85fadadab410d4004f4fb to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2023-10-16Snap for 10957012 from e50a3e2077ede6a35cc85fadadab410d4004f4fb to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I74e72a5c21302cbd29648fa0b749fcfc62bf6eef
2023-08-04Merge "Snap for 10612529 from f6771e370c76c544b81f5caef4133a43fb91712c to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2023-08-04Snap for 10612529 from f6771e370c76c544b81f5caef4133a43fb91712c to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I520b55a277bb9940d3b48d6daf22f3902618976e
2023-07-20Merge "Snap for 10448490 from 1906ac8821368b101d4ebfb68faa09a546df3bdd to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2023-07-20Snap for 10448490 from 1906ac8821368b101d4ebfb68faa09a546df3bdd to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: Ibad38d7ae92883fe5ce528d5139ab718985972c0
2023-07-18Merge "Move OWNER reference master=>main." into main am: f6771e370c am: ↵android-u-qpr3-beta-1-gplandroid-u-qpr2-beta-2-gplTreehugger Robot
e50a3e2077 am: b8c3584549 am: f1101c7386 Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2661043 Change-Id: Idefb8d6fdcf1f21effb866e6b6c48e90a33651f1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: f6771e370c am: ↵Treehugger Robot
e50a3e2077 am: b8c3584549 Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2661043 Change-Id: I834d44dd38d8bf1af26e2c51d3ef2863239141fd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: f6771e370c am: ↵Treehugger Robot
e50a3e2077 Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2661043 Change-Id: Ibb5fcdbc3ab476302b78d07708c6d5a4484fd5aa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into main am: f6771e370candroid-u-rb-dp-10-gplandroid-u-rb-dp-10-gplTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2661043 Change-Id: I32cdf7e3913c57068bc9ada4f2cba5434f5a6c27 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-18Merge "Move OWNER reference master=>main." into mainTreehugger Robot
2023-07-18Move OWNER reference master=>main.Sam Saccone
BUG=b/291759353 Change-Id: I3cb86e95fe5af150eb08eaec9fe337580f494a88
2023-06-20Merge "pppd: fix ip-up-vpn path" am: 6e26ec0129 am: 1906ac8821 am: ↵Patrick Rohr
ee900d223a am: e746383268 am: 9eb1ed3948 Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2627090 Change-Id: Icd3ed9794c86550c1a85f3dd4c605ed2bbcda0ab Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20Merge "pppd: fix ip-up-vpn path" am: 6e26ec0129 am: 1906ac8821 am: ↵Patrick Rohr
ee900d223a am: e746383268 Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2627090 Change-Id: I0dc3a674f7e749f221fa1e07becd490bfcea3d23 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20Merge "pppd: fix ip-up-vpn path" am: 6e26ec0129 am: 1906ac8821 am: ee900d223aPatrick Rohr
Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2627090 Change-Id: I85596031d5955f6a562a4ef6e5c8c3c99f7a78f4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20Merge "pppd: fix ip-up-vpn path" am: 6e26ec0129 am: 1906ac8821Patrick Rohr
Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2627090 Change-Id: I4b616ad30eed169c445e87b023efff44bdc1d99b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20Merge "pppd: fix ip-up-vpn path" am: 6e26ec0129android-u-beta-4-gplPatrick Rohr
Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2627090 Change-Id: I53d64285e78642f779c7fa0dc08ead4d564467e0 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-20Merge "pppd: fix ip-up-vpn path"Patrick Rohr
2023-06-16[automerger skipped] [NFC] Move MTE mode settings to a product variable. am: ↵Evgenii Stepanov
2d924d7934 am: 17ae8cdb81 -s ours am skip reason: Merged-In I24311aae44ed0c9b903f48411355f1dc5c025fe3 with SHA-1 2d924d7934 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ppp/+/23717049 Change-Id: Icff849ef73fa4eb9bbedc457fb390e7810c0518d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16[automerger skipped] [NFC] Move MTE mode settings to a product variable. am: ↵Evgenii Stepanov
2d924d7934 -s ours am: 438250db44 -s ours am skip reason: Merged-In I24311aae44ed0c9b903f48411355f1dc5c025fe3 with SHA-1 b7756bbf67 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ppp/+/23717049 Change-Id: Ie5c420b046fb69c3b7f22ed0b213b5ab6aa7ecbf Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16[NFC] Move MTE mode settings to a product variable. am: 2d924d7934Evgenii Stepanov
Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ppp/+/23717049 Change-Id: Ib0912b6ca0f6bbb8817725a5cfa3a297f7e1768f Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-16[automerger skipped] [NFC] Move MTE mode settings to a product variable. am: ↵Evgenii Stepanov
2d924d7934 -s ours am skip reason: Merged-In I24311aae44ed0c9b903f48411355f1dc5c025fe3 with SHA-1 b7756bbf67 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/ppp/+/23717049 Change-Id: Ic1583b9c0af14f979adf8b820a76f8ccd7e1c3d4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15[NFC] Move MTE mode settings to a product variable.Evgenii Stepanov
The default list of memtag targets found in build/make/target/product/memtag-common.mk Bug: 280343521 Test: no functional change Merged-In: I24311aae44ed0c9b903f48411355f1dc5c025fe3 Change-Id: I24311aae44ed0c9b903f48411355f1dc5c025fe3 (cherry picked from commit b7756bbf6735121baffc7e01df4c4b51cf205c0b)
2023-06-15pppd: fix ip-up-vpn pathPatrick Rohr
/system/bin/ip-up eventually gets passed into run_program() and becomes /system/bin/ip-up-vpn: https://cs.android.com/android/platform/external/ppp/+/master:pppd/main.c;l=1803;drc=4c7b27fca0c68ef2c570769d50792f201974e0d4 This file was moved in aosp/1882449. Bug: 263463339 Test: I have not tested this. Change-Id: I9c09112a4354232063b104275dc7283551f570ea
2023-06-15Merge "[NFC] Move MTE mode settings to a product variable." am: 8eff50a7f2 ↵Evgenii Stepanov
am: cb3dfa762e am: f405002dea am: 2efe136678 am: add03297fd Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2623534 Change-Id: I4e73fe9988d7da720ef82a6fcdf2c4ef49e5ed69 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15Merge "[NFC] Move MTE mode settings to a product variable." am: 8eff50a7f2 ↵Evgenii Stepanov
am: cb3dfa762e am: f405002dea am: 2efe136678 Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2623534 Change-Id: I7385449dc685638c2959f038be06ec93645b445b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15Merge "[NFC] Move MTE mode settings to a product variable." am: 8eff50a7f2 ↵Evgenii Stepanov
am: cb3dfa762e am: f405002dea Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2623534 Change-Id: I0bde1dfca3456b948a8f5c202d6a924aa4360fd4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15Merge "[NFC] Move MTE mode settings to a product variable." am: 8eff50a7f2 ↵Evgenii Stepanov
am: cb3dfa762e Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2623534 Change-Id: I9f6eb901544db2efbbc936418c6f2153dc8f5851 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-15Merge "[NFC] Move MTE mode settings to a product variable." am: 8eff50a7f2Evgenii Stepanov
Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2623534 Change-Id: Idab825ebf825b2a3a042c8d5ae8b8e14f29a2c37 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-14Merge "[NFC] Move MTE mode settings to a product variable."Evgenii Stepanov
2023-06-12[NFC] Move MTE mode settings to a product variable.Evgenii Stepanov
The default list of memtag targets found in build/make/target/product/memtag-common.mk Bug: 280343521 Test: no functional change Change-Id: I24311aae44ed0c9b903f48411355f1dc5c025fe3
2023-04-20Merge "Snap for 9982369 from a2ca0c96da28460a85c787a4d8abab38e8478b8e to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2023-04-20Snap for 9982369 from a2ca0c96da28460a85c787a4d8abab38e8478b8e to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I32c3d479dd61a3628e30e27fcf1623e98b1d778c
2023-04-11Merge "Editing the METADATA file of ppp" am: a2ca0c96da am: 992682a09b am: ↵Sadaf Ebrahimi
d4ada000bd am: 6579d5a354 Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2518315 Change-Id: I5c9ac24522dacd3078c7308c2a7d7f7cd35b97e2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11Merge "Editing the METADATA file of ppp" am: a2ca0c96da am: 992682a09b am: ↵android14-devSadaf Ebrahimi
d4ada000bd Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2518315 Change-Id: I37cdedf6aaf71367e133c3cb0f99622de5f37426 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11Merge "Editing the METADATA file of ppp" am: a2ca0c96da am: 992682a09bSadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2518315 Change-Id: I1b73244e391453c2a2823421b2ed395cf8f1d874 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11Merge "Editing the METADATA file of ppp" am: a2ca0c96daSadaf Ebrahimi
Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2518315 Change-Id: I766672f4770451504807ba2f8d9ed4b3696e165c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11Merge "Editing the METADATA file of ppp"android-u-beta-3-gplandroid-u-beta-2-gplandroid-u-beta-1-gplSadaf Ebrahimi
2023-03-31Editing the METADATA file of pppSadaf Ebrahimi
Test: TreeHugger Change-Id: I67f3271961f1ce319b53b2144dbd49e5bd2aad3a
2023-03-15Merge "Snap for 9751898 from b71b4f3d5cd5d777aaf53c35c481f882f3774b49 to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2023-03-15Snap for 9751898 from b71b4f3d5cd5d777aaf53c35c481f882f3774b49 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I03304d198e61c8e5b6102024f3b1f3f75ea8ea5c
2023-02-24Merge "Snap for 9652768 from 44397d0accf690cf87a9ee2b4fa5f8c83aafd146 to ↵Android Build Coastguard Worker
simpleperf-release" into simpleperf-release
2023-02-24Snap for 9652768 from 44397d0accf690cf87a9ee2b4fa5f8c83aafd146 to ↵Android Build Coastguard Worker
simpleperf-release Change-Id: I0a79bc38f6c8acaad1aa58f085998076a0aeb66c
2023-02-10Merge "Field "version" should be defined in third_party" am: 44397d0acc am: ↵Maciej Żenczykowski
b71b4f3d5c am: 874c8d96d8 Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2428036 Change-Id: I7e63e018eab9d3030a1180244330eeb6072e094e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10Merge "Field "version" should be defined in third_party" am: 44397d0acc am: ↵Maciej Żenczykowski
b71b4f3d5c Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2428036 Change-Id: I5988fd8b29ee767a0afea10ee2019ddc5d6a3ccc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-10Merge "Field "version" should be defined in third_party" am: 44397d0accMaciej Żenczykowski
Original change: https://android-review.googlesource.com/c/platform/external/ppp/+/2428036 Change-Id: I85c6af012ad3991e2c9d63e2781b67658fe651f5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-24 23:54:00 +0000