summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge "Snap for 7209783 from aa41ff007424f58df7720fd1eeae184b67b16793 to ↵simpleperf-releaseandroid-build-prod (mdb)2021-03-150-0/+0
|\ | | | | | | simpleperf-release" into simpleperf-release
| * Snap for 7209783 from aa41ff007424f58df7720fd1eeae184b67b16793 to ↵android-build-prod (mdb)2021-03-150-0/+0
|/| | | | | | | | | | | simpleperf-release Change-Id: I5fd8e30faae88b169657df97a08b536c88af25d6
| * Mark ab/7061308 as merged in stage.HEADandroid-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1mastermain-cg-testing-releaseandroid-s-beta-4Xin Li2021-02-200-0/+0
| |\ | | | | | | | | | | | | | | | Bug: 180401296 Merged-In: I71d74c1f385f93f0a4c8bba0b033b7f762c3a57f Change-Id: I3ad6ab4a3b9edea1cb083d3ea392ae16298805bc
| | * Mark ab/6881855 as merged am: bdb8c8575eXin Li2020-11-240-0/+0
| | |\ | | | | | | | | | | | | | | | | | | | | Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/13111226 Change-Id: I71d74c1f385f93f0a4c8bba0b033b7f762c3a57f
| | * \ Merge "Introduce sh.vendor_ramdisk." am: 3139f96069 am: c7cff8ed5d am: ↵Yifan Hong2020-10-291-0/+1
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 7b8ded2414 Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1469768 Change-Id: Ib433bf2ab39b06d52c72a90b32bd13ea8db67322
| | | * \ Merge "Introduce sh.vendor_ramdisk." am: 3139f96069 am: c7cff8ed5dYifan Hong2020-10-291-0/+1
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1469768 Change-Id: I1b095931dfb2f17bd72e75b3580f9f38338bc7f6
| | * | | | [automerger skipped] Skip ab/6749736 in stage. am: 1f4114a71c -s ours am: ↵Xin Li2020-10-090-0/+0
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 06e8f636b2 -s ours am skip reason: Change-Id Iafbad9ddcbd48a9ef9027de70ccd2fc0ab0679f8 with SHA-1 fcdb2d6958 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/12796984 Change-Id: Ib94ed3f2cb3f191f0fb99b84612e46a83dd1f29c
| | | * | | [automerger skipped] Skip ab/6749736 in stage. am: 1f4114a71c -s oursXin Li2020-10-090-0/+0
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am skip reason: Change-Id Iafbad9ddcbd48a9ef9027de70ccd2fc0ab0679f8 with SHA-1 fcdb2d6958 is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/mksh/+/12796984 Change-Id: I7324e027612fadce54abe08d3a5ba08e15727f2d
| * | | \ \ \ Merge "Add LOCAL_LICENSE_KINDS to external/mksh" am: 07c71e8895Treehugger Robot2021-02-051-0/+18
| |\ \ \ \ \ \ | | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1575801 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Ie23d2aed3fb99f7e15aa131d7733983d155d63d1
* | | | | | | Merge "Snap for 7168215 from 07c71e88951f1996682c2c30447ca183d0823250 to ↵android-build-prod (mdb)2021-02-241-0/+18
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | simpleperf-release" into simpleperf-release
| * | | | | | | Snap for 7168215 from 07c71e88951f1996682c2c30447ca183d0823250 to ↵android-build-prod (mdb)2021-02-241-0/+18
|/| | | | | | | | | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | simpleperf-release Change-Id: I4278c60e88a87ce56125141d9811d3155caaf8da
| * | | | | | Merge "Add LOCAL_LICENSE_KINDS to external/mksh"android-s-preview-1Treehugger Robot2021-02-051-0/+18
| |\ \ \ \ \ \ | | |/ / / / / | |/| | | | |
| | * | | | | Add LOCAL_LICENSE_KINDS to external/mkshBob Badour2021-02-051-0/+18
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added SPDX-license-identifier-BSD SPDX-license-identifier-MIT SPDX-license-identifier-Unicode-DFS legacy_notice to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Exempt-From-Owner-Approval: janitorial work Change-Id: Idf14d4318a318ee583c80d3f67fe5996e9c17e8d
* | | | | | Merge "Snap for 7116807 from bdb8c8575e548bd3c8da5f58fa1e329e2ad380aa to ↵android-build-prod (mdb)2021-02-010-0/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | simpleperf-release" into simpleperf-release
| * | | | | | Snap for 7116807 from bdb8c8575e548bd3c8da5f58fa1e329e2ad380aa to ↵android-build-prod (mdb)2021-02-010-0/+0
|/| | | | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | simpleperf-release Change-Id: I91d8950e77d47bef86cee14f3e9f7b6371ac789b
| * | | | / Mark ab/6881855 as mergedXin Li2020-11-230-0/+0
| |\| | | | | | |_|_|/ | |/| | | | | | | | | | | | | Bug: 172690556 Change-Id: I0b534f2aa924e47a24351c8d026222f41906791a
| | * | | Merge "Update the NOTICE file." am: 4d0a1a5064 am: 0734bcbddc am: 9b2839eb3a ↵Treehugger Robot2020-09-011-22/+67
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5985b7f2de Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1416651 Change-Id: If380fded0213e932ffd6a968396caca2109a8fb7
| | | * | Merge "Update the NOTICE file." am: 4d0a1a5064 am: 0734bcbddc am: 9b2839eb3aTreehugger Robot2020-09-011-22/+67
| | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1416651 Change-Id: Ib3b7bebc27ed252b2b58d95c660e3154353f8d7e
| | | | * \ Merge "Update the NOTICE file." am: 4d0a1a5064 am: 0734bcbddcTreehugger Robot2020-09-011-22/+67
| | | | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1416651 Change-Id: I1ae82d07e90bc7984aae977d732de7cdc7fb83f7
| | * | | | | Merge "Upgrade to mksh R59b." am: 4adbc81376 am: efb93a535d am: d04311005c ↵Treehugger Robot2020-05-2114-175/+360
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: fcdb2d6958 Change-Id: I9882cfd38faf9b21d11c3f89c102bfb3cf72a4d8
| | * | | | | Merge "Upgrade to mksh R59." am: f54e593e39 am: ce5d2ec295 am: fbd053ec48 ↵Treehugger Robot2020-05-2030-1968/+3628
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 959e0c2663 Change-Id: Ib036615803f56743489fdc1445b8ab5449968fa7
| | * \ \ \ \ \ Merge "Add METADATA to mksh: MIT=NOTICE" am: 19d12c0d97 am: 6f444b4cb6 am: ↵Bob Badour2020-04-291-0/+3
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | e7f792145a am: 898c8bc7c9 Change-Id: I8c1ba59c255a9ec9e5425048e83d7d8b385834fc
| * | \ \ \ \ \ \ Merge "Introduce sh.vendor_ramdisk." am: 3139f96069Yifan Hong2020-10-291-0/+1
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1469768 Change-Id: I188b24afecab51d8081afd0bc46e11c684075655
* | | | | | | | | Merge "Snap for 7002008 from 3139f96069da9bc6f94df0c406d7cc53048fb778 to ↵android-build-prod (mdb)2020-11-301-0/+1
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simpleperf-release" into simpleperf-release
| * | | | | | | | | Snap for 7002008 from 3139f96069da9bc6f94df0c406d7cc53048fb778 to ↵android-build-prod (mdb)2020-11-301-0/+1
|/| | | | | | | | | | | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simpleperf-release Change-Id: Ibe56b4a2813fbe9d439f601020775bccdaa92089
| * | | | | | | | Merge "Introduce sh.vendor_ramdisk."Yifan Hong2020-10-291-0/+1
| |\ \ \ \ \ \ \ \ | | |/ / / / / / / | |/| | | | | | |
| | * | | | | | | Introduce sh.vendor_ramdisk.Yifan Hong2020-10-281-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test: pass Bug: 156098440 Change-Id: Ie267b05c250a5f1831ae6d25aad9ea7bdc66ab2a
| * | | | | | | | Skip ab/6749736 in stage.Xin Li2020-10-080-0/+0
| |\ \ \ \ \ \ \ \ | | | |_|_|_|/ / / | | |/| | | | | / | | |_|_|_|_|_|/ | |/| | | | | | Merged-In: Iafbad9ddcbd48a9ef9027de70ccd2fc0ab0679f8 Change-Id: I568a9eb47e99954a691a0986a3515dabc26459fa
| | * | | | | | Merge "Upgrade to mksh R59b." am: 4adbc81376 am: efb93a535d am: d04311005cTreehugger Robot2020-05-2114-175/+360
| | |\ \ \ \ \ \ | | | |_|_|_|/ / | | |/| | | | / | | | | |_|_|/ | | | |/| | | Change-Id: Iafbad9ddcbd48a9ef9027de70ccd2fc0ab0679f8
| | * | | | | Merge "Upgrade to mksh R59." am: f54e593e39 am: ce5d2ec295 am: fbd053ec48Treehugger Robot2020-05-1930-1968/+3628
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | Change-Id: I85c6edfcc6174ceff7170110f901895c020e35db
| | * | | | | Merge "Add METADATA to mksh: MIT=NOTICE" am: 19d12c0d97 am: 6f444b4cb6 am: ↵Bob Badour2020-04-291-0/+3
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | e7f792145a Change-Id: Iea003533c0e86978f43773b1630ffb11d3ba9a6d
* | | | | | | Merge "Snap for 6844436 from 0734bcbddc1db38d6c8aa728337f5005a4ff2664 to ↵android-build-prod (mdb)2020-09-171-22/+67
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | simpleperf-release" into simpleperf-release
| * | | | | | | Snap for 6844436 from 0734bcbddc1db38d6c8aa728337f5005a4ff2664 to ↵android-build-prod (mdb)2020-09-171-22/+67
|/| | | | | | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | simpleperf-release Change-Id: Iebb644567433db33f8e7af28e64044b12fc72639
| * | | | | | Merge "Update the NOTICE file." am: 4d0a1a5064Treehugger Robot2020-09-011-22/+67
| |\ \ \ \ \ \ | | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | Original change: https://android-review.googlesource.com/c/platform/external/mksh/+/1416651 Change-Id: I4b8cab145ad98d12eac8fb79cf636b899e6fd476
| | * | | | | Merge "Update the NOTICE file."Treehugger Robot2020-09-011-22/+67
| | |\ \ \ \ \ | | | |_|_|_|/ | | |/| | | |
| | | * | | | Update the NOTICE file.Elliott Hughes2020-09-011-22/+67
| | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Copied from <http://www.mirbsd.org/TaC-mksh.txt>. Bug: https://issuetracker.google.com/167231622 Test: treehugger Change-Id: Id8e77179ffeeb57662659220b90a8617170c8009
| * | | | / Merge "Upgrade to mksh R59b." am: 4adbc81376 am: efb93a535dTreehugger Robot2020-05-2114-175/+360
| |\| | | | | | |_|_|/ | |/| | | | | | | | Change-Id: I12d26d6a8756b35fd6ad111a4631c7476853a356
| * | | | Merge "Upgrade to mksh R59." am: f54e593e39 am: ce5d2ec295Treehugger Robot2020-05-1930-1968/+3628
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | Change-Id: I4a48638b96e9439d252730d4ddf61f4593da6ed8
| * | | | Merge "Add METADATA to mksh: MIT=NOTICE" am: 19d12c0d97 am: 6f444b4cb6Bob Badour2020-04-291-0/+3
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | Change-Id: I24d5789d5b7e9a24660b00b66266f6bd77c1fe65
| * | | | [automerger skipped] DO NOT MERGE - ↵android-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_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_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-releaseXin Li2019-10-300-0/+0
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 596fee7ca5 am: 63d55d82e7 -s ours am skip reason: subject contains skip directive Change-Id: I414c226e399c98a87c0cfcab560148b9c5db796b
| * \ \ \ \ Merge "mksh: stop loading libc++ and libm." am: 701334bc0c am: afaa7f8be8 ↵Elliott Hughes2019-09-241-0/+3
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5433273b97 am: 343d0fc340 Change-Id: I448aeae030345028cbe87163fe8ece7f191d9f2a
| * \ \ \ \ \ Merge master@5428150 into git_qt-dev. am: 146c8d0123Bill Rassieur2019-04-030-0/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 9f3a975a6c Change-Id: Ifc2391e84ca9c64569376e6a18bd5e45a475229b
| | * \ \ \ \ \ Merge master@5428150 into git_qt-dev.Bill Rassieur2019-04-030-0/+0
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 146c8d0123 Change-Id: Ic5c34305f70e57e2b1f4ffde7aac9a603b650b61
| | | * \ \ \ \ \ Merge master@5428150 into git_qt-dev.Bill Rassieur2019-04-0222-190/+577
| | | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I33dd438731224b8ead2aa7733ab84d39acaec77a BUG: 129345239
* | | | \ \ \ \ \ \ Merge "Snap for 6577974 from efb93a535d09dced0c9d563fd0a1760550954184 to ↵android-build-prod (mdb)2020-06-1031-2070/+3918
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simpleperf-release" into simpleperf-release
| * | | | | | | | | | Snap for 6577974 from efb93a535d09dced0c9d563fd0a1760550954184 to ↵android-build-prod (mdb)2020-06-1031-2070/+3918
|/| | | | | | | | | | | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | simpleperf-release Change-Id: I56862d725b279aa2cda7584b18caaa9b0511f302
| * | | | | | | | | Merge "Upgrade to mksh R59b." am: 4adbc81376android-r-beta-3android-r-beta-2Treehugger Robot2020-05-2114-175/+360
| |\ \ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | Change-Id: Iac37178ba86b7e406600c3bcf79f33149c5e746e
| | * | | | | | | | Merge "Upgrade to mksh R59b."Treehugger Robot2020-05-2114-175/+360
| | |\ \ \ \ \ \ \ \
| | | * | | | | | | | Upgrade to mksh R59b.Elliott Hughes2020-05-2014-175/+360
| | |/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | R59b is a must-have bugfix upgrade for R59 (not R58): [tg] Handle other tmux $TERM types, pointed out by multi via IRC [tg] Fix typo in FAQ [tg] y='a\*b'; [[ $x = $y ]] regression (Martijn Dekker) fix [l0kod] Defuse CLIP OS O_MAYEXEC support (cf. LWN) [tg] Make set +o output a command to restore the currently set and (new!) cleared options, keep a reset state per session (experimental) [tg] Correct documentation and code regarding to argv[0] parsing: first ‘-’ for login shells, then ‘r’ case-insensitively for restricted shell, then “sh”*, again case-insensitively, for BINSH_* modes; add tests [tg] On OS/2, allow case-insensitive name for direct builtin call [tg] Always skip startup files if direct builtin call [tg] Avoid some sometimes-redundant startup codepaths Test: treehugger Change-Id: I7b0a1d37b4d3fdf1f78569458769e89dca755fcb
| * | | | | | | | / Merge "Upgrade to mksh R59." am: f54e593e39Treehugger Robot2020-05-1930-1968/+3628
| |\| | | | | | | | | | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | Change-Id: Ideaba8c15eca297b3d3027498e7c7d52cc4a998d
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-08 17:40:51 +0000