aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-01Merge "Update for C11." am: 03689cc40e am: 61ff2feebd am: 642de20f5d am: ↵android-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_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-d4-s2-releaseandroid13-d4-s1-releaseandroid13-d4-releaseElliott Hughes
90d369459c am: 3984806da7 Original change: https://android-review.googlesource.com/c/platform/external/strace/+/2050345 Change-Id: I83f6ec223c94b3c6e07627738df3410594e62f18 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Update for C11." am: 03689cc40e am: 61ff2feebd am: 642de20f5d am: ↵Elliott Hughes
90d369459c Original change: https://android-review.googlesource.com/c/platform/external/strace/+/2050345 Change-Id: I3086d2c04abde94e708147071af4a1175b1f185d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Update for C11." am: 03689cc40e am: 61ff2feebd am: 642de20f5dt_frc_odp_330442040t_frc_odp_330442000t_frc_ase_330444010android13-frc-odp-releaseandroid13-devElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/strace/+/2050345 Change-Id: I949c1d365ea706c2f4a41998a1a0019c9e6dccd8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Update for C11." am: 03689cc40e am: 61ff2feebdElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/strace/+/2050345 Change-Id: I5db0f25f11a146d78171ffafa35951bac0989756 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Update for C11." am: 03689cc40eElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/strace/+/2050345 Change-Id: I208824dd33c4a00d79f783e2ae88295d3f0d0827 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01Merge "Update for C11."Elliott Hughes
2022-03-31Update for C11.Elliott Hughes
Test: treehugger Change-Id: I5685769092466a5b4f1ebc3ca56de742bcdb298f
2021-11-03Merge "Remove ipx support." am: 749015bbd7 am: 40b807329e am: 766180719a am: ↵Christopher Ferris
ac5b825381 am: 5e68c42b3e Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1879067 Change-Id: I0832241d0daca3eda4bc01e9973cfcdb6a536726
2021-11-03Merge "Remove ipx support." am: 749015bbd7 am: 40b807329e am: 766180719a am: ↵Christopher Ferris
ac5b825381 Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1879067 Change-Id: I560fa28346db11ebd2afa8d0c03511858086ecd4
2021-11-03Merge "Remove ipx support." am: 749015bbd7 am: 40b807329e am: 766180719aChristopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1879067 Change-Id: I75caeb74b8567108da998a344b8ea28dcb13c3cd
2021-11-03Merge "Remove ipx support." am: 749015bbd7 am: 40b807329eChristopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1879067 Change-Id: I4d3506f9886d0ad8caeebc0ce982c6c5131c5d8e
2021-11-03Merge "Remove ipx support." am: 749015bbd7android-t-preview-2android-t-preview-1android-t-beta-3android-s-v2-beta-3android-s-qpr3-beta-1android-t-preview-1android-s-v2-beta-3android-s-qpr3-beta-1Christopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1879067 Change-Id: I4fae4cbb1451d12ab879461988e04530b8ea6122
2021-11-03Merge "Remove ipx support."Christopher Ferris
2021-11-02Remove ipx support.Christopher Ferris
In kernel v5.15, ipx support has been removed, so remove it from strace too. Test: Builds and ran strace ls Change-Id: Id85edba357481ee6a41e617e248a94d73945d108
2021-06-02Merge sc-mainline-prodXin Li
Bug: 189946434 Change-Id: I6a7fe5fcd6bbc32cbac01e174c4dc520769a7b52
2021-02-17Merge "Add LOCAL_LICENSE_KINDS to external/strace" am: 91ca7ad713 am: ↵android-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-releaseBob Badour
a7b1c45abb am: 431bebf444 am: 05b67532be Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1586055 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I890c8ce74e919ec7e5d9bd76bc7b6b00f415087e
2021-02-17Merge "Add LOCAL_LICENSE_KINDS to external/strace" am: 91ca7ad713 am: ↵Bob Badour
a7b1c45abb am: 431bebf444 am: 05b67532be Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1586055 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Id8dc5fc0785cb027e816f0c469cc6c87160d9d14
2021-02-17Merge "Add LOCAL_LICENSE_KINDS to external/strace" am: 91ca7ad713 am: ↵android-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-mainline-12.0.0_r4android-mainline-12.0.0_r36android-12.1.0_r9android-12.1.0_r8android-12.1.0_r7android-12.1.0_r26android-12.1.0_r25android-12.1.0_r24android-12.1.0_r23android-12.1.0_r22android-12.1.0_r21android-12.1.0_r20android-12.1.0_r19android-12.1.0_r18android-12.1.0_r17android-12.1.0_r16android-12.1.0_r15android-12.1.0_r14android-12.1.0_r13android-12.1.0_r12android-12.1.0_r11android-12.1.0_r10android-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_r16android12L-devandroid12L-d2-s8-releaseandroid12L-d2-s7-releaseandroid12L-d2-s6-releaseandroid12L-d2-s5-releaseandroid12L-d2-s4-releaseandroid12L-d2-s3-releaseandroid12L-d2-s2-releaseandroid12L-d2-s1-releaseandroid12L-d2-releaseandroid12-qpr3-s7-releaseandroid12-qpr3-s6-releaseandroid12-qpr3-s5-releaseandroid12-qpr3-s4-releaseandroid12-qpr3-s3-releaseandroid12-qpr3-s2-releaseandroid12-qpr3-s1-releaseandroid12-qpr3-releaseandroid12-qpr1-releaseandroid12-qpr1-d-s3-releaseandroid12-qpr1-d-s2-releaseandroid12-qpr1-d-s1-releaseandroid12-qpr1-d-releaseandroid12-devandroid12--mainline-releaseandroid-s-v2-preview-1Bob Badour
a7b1c45abb am: 431bebf444 Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1586055 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I1e867a7fc0ece4f57214a4e9b05a470c812f655f
2021-02-17Merge "Add LOCAL_LICENSE_KINDS to external/strace" am: 91ca7ad713 am: a7b1c45abbBob Badour
Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1586055 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I2d303913e7c93bc974da00792a1a5a9b510a00ae
2021-02-17Merge "Add LOCAL_LICENSE_KINDS to external/strace" am: 91ca7ad713android-s-beta-5android-s-beta-4android-s-beta-3android-s-beta-2android-s-beta-1android-s-beta-5android-s-beta-4Bob Badour
Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1586055 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icc1aecb15f61481cdb8792362ddca3f214982c2d
2021-02-17Merge "Add LOCAL_LICENSE_KINDS to external/strace"android-s-preview-1Bob Badour
2021-02-12Add LOCAL_LICENSE_KINDS to external/straceBob Badour
Added SPDX-license-identifier-BSD SPDX-license-identifier-FSFAP SPDX-license-identifier-MIT legacy_notice legacy_unencumbered to: Android.bp Bug: 68860345 Bug: 151177513 Bug: 151953481 Test: m all Change-Id: I5d8f5fee9f877b7fa6b53ebc2db7698570261d1e
2020-06-05Merge "32 bit kvm is deprecated." am: e862cfa113 am: 7233cfe8da am: ↵Christopher Ferris
22ff4c65a2 am: 46a07aac08 am: 7565beadf1 Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1324951 Change-Id: Ife6f2674e538de3575ed2dbdbeb6dd3f25c5e684
2020-06-05Merge "32 bit kvm is deprecated." am: e862cfa113 am: 7233cfe8da am: ↵Christopher Ferris
22ff4c65a2 am: 46a07aac08 Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1324951 Change-Id: I0995fdba8eb16fc88f8b9e36ab4e8ed712fb372e
2020-06-05Merge "32 bit kvm is deprecated." am: e862cfa113 am: 7233cfe8da am: 22ff4c65a2Christopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1324951 Change-Id: Ibbe40f7f02a7ee53943cf1c6327ffd8e42bff112
2020-06-05Merge "32 bit kvm is deprecated." am: e862cfa113 am: 7233cfe8daChristopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1324951 Change-Id: I0505accc196c0fc03cd9078996b73714e64547ef
2020-06-05Merge "32 bit kvm is deprecated." am: e862cfa113Christopher Ferris
Original change: https://android-review.googlesource.com/c/platform/external/strace/+/1324951 Change-Id: I35c9b1c1a29e69a9b12b216b8c83a0299aadfc9d
2020-06-05Merge "32 bit kvm is deprecated."android-r-beta-3android-r-beta-2Christopher Ferris
2020-06-0432 bit kvm is deprecated.Christopher Ferris
Starting with kernel 5.7 32 bit kvm is deprecated and it's not really being used any way. Test: aosp_arm-eng builds. Change-Id: Iaa8964087397ecd7762afc2dfa37c20f5763e722
2020-04-29Merge "Add METADATA to strace: BSD+MIT+Apache2=NOTICE" am: a92ba57a4d am: ↵Bob Badour
7b7345d05f am: 00ca49d61c am: f72c0ad96e am: 466692384e Change-Id: I34beebc1bf3a03c8944c744c7222b965d5de1e4c
2020-04-29Merge "Add METADATA to strace: BSD+MIT+Apache2=NOTICE" am: a92ba57a4d am: ↵Bob Badour
7b7345d05f am: 00ca49d61c am: f72c0ad96e Change-Id: I25ca8cf7501b0e026264070d5c41fa2a86b078ee
2020-04-29Merge "Add METADATA to strace: BSD+MIT+Apache2=NOTICE" am: a92ba57a4d am: ↵Bob Badour
7b7345d05f am: 00ca49d61c Change-Id: Iedb1805a6a3bb6273d0ad440fbe4f212423b42e6
2020-04-29Merge "Add METADATA to strace: BSD+MIT+Apache2=NOTICE" am: a92ba57a4d am: ↵Bob Badour
7b7345d05f Change-Id: Ia832eeda51eead7e839fe3a0f39cb4b3dcca35d2
2020-04-28Merge "Add METADATA to strace: BSD+MIT+Apache2=NOTICE" am: a92ba57a4dBob Badour
Change-Id: I25483c3d3636f88b11b11f6c845024843c0fbe33
2020-04-28Merge "Add METADATA to strace: BSD+MIT+Apache2=NOTICE"Bob Badour
2020-04-28Add METADATA to strace: BSD+MIT+Apache2=NOTICEBob Badour
Bug: 68860345 Bug: 69058154 Bug: 151953481 Test: no code changes Change-Id: Ifa044e3cb7803102bf24d9a549743e0238bf0da4
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f3c4404c63 -s ours am: 354cf316e1 am: 5f45f50fae am: 77f3669fbf -s ours am skip reason: subject contains skip directive Change-Id: Idd80cf4f7806c86b387dd89617b4c45b5a7edf5f
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f3c4404c63 -s ours am: 354cf316e1 am: 5f45f50fae Change-Id: Ie1f32b69bc165f3d2d87ad83097d247d649e5702
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f3c4404c63 -s ours am: 354cf316e1 Change-Id: I0efe75cd6e3012f2f68aec04e315d49e0104d875
2020-04-10[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into ↵Xin Li
stag-aosp-master am: f3c4404c63 -s ours am skip reason: subject contains skip directive Change-Id: I76c727b8b474d035967b75f53e11bf10cdc62473
2020-04-09DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-masterXin Li
Bug: 151763422 Change-Id: I9da7b81c6f3d3ac7b5ee278af1f2758fd6b95cb9
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 8eb70443d5 am: 758bd472ae ↵Treehugger Robot
am: f47fb778b3 am: 4780250afb am: c95e234f75 Change-Id: I5f6ac81757bcab8d651ef1155bc405c6f710930f
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 8eb70443d5 am: 758bd472ae ↵Treehugger Robot
am: f47fb778b3 am: 4780250afb Change-Id: Ic1358d8ec9151a671f12f0c26dc34d2a8a67d228
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 8eb70443d5 am: 758bd472ae ↵Treehugger Robot
am: f47fb778b3 Change-Id: I7b8c8cbb594c01d6851849728c6a0acee5cb3834
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 8eb70443d5 am: 758bd472aeTreehugger Robot
Change-Id: I31bd6eef31c3204325373fad366ddc7d1b7ff50f
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 8eb70443d5 am: 758bd472aeTreehugger Robot
Change-Id: Idea4e4dc07c35b86510c77d757d30fd411530376
2020-03-26Merge "Remove redundant NOTICE symbolic link." am: 8eb70443d5Treehugger Robot
Change-Id: I111014077e8586b409e3122bd32c18c0a3583bcc
2020-03-26Merge "Remove redundant NOTICE symbolic link."Treehugger Robot
2020-03-25Remove redundant NOTICE symbolic link.Bob Badour
Now that http://aosp/1235427 and http://aosp/1238719 are in, NOTICE symbolic links are no longer needed. Bug: 67772237 Bug: 68860345 Test: manually built and diffed before and after system image notices Change-Id: I49325867e0af0bcc08e234a39bd4a0e3a2e66043
2020-03-19[automerger skipped] DO NOT MERGE - Empty merge ↵Xin Li
qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: b66b1d92c4 -s ours am: a7e0ba37db am: bd676d806c am: c28e7e81cc -s ours am skip reason: subject contains skip directive Change-Id: Ib8ac81a3584e2076b42bad9111039cbdbf29f2e0
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-15 21:31:56 +0000