aboutsummaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2022-04-25Merge "Snap for 8496002 from 4399e8f9ea319217ba19d50ac23431d9a54e3f51 to ↵main-cg-testing-releaseAndroid Build Coastguard Worker
main-cg-testing-release" into main-cg-testing-release
2022-04-25Snap for 8496002 from 4399e8f9ea319217ba19d50ac23431d9a54e3f51 to ↵Android Build Coastguard Worker
main-cg-testing-release Change-Id: I97dee3f6d548bc86f58096f63af55aa56d91b501
2022-04-22Merge "Undo the accidental config.h changes in the pcre 10.40 update."Elliott Hughes
2022-04-20Undo the accidental config.h changes in the pcre 10.40 update.Elliott Hughes
Most importantly, the __attribute__((__uninitialized__)) #define, which is important for performance. Found post-submit by a 0.5s boot time regression. (There are lots of regular expressions used in the SELinux stuff.) Bug: http://b/229665357 Test: treehugger Change-Id: Ie4760c3e959110bdad361aceff438d1f2bb8e5bb
2022-04-18Merge "Upgrade pcre to pcre2-10.40"Elliott Hughes
2022-04-15Upgrade pcre to pcre2-10.40Elliott Hughes
Test: make Change-Id: I5d7243566be5bc6b8e2a5eaf08dec2d08a565f84
2022-03-14Merge "Snap for 8294919 from c58c5cc9f519e540651e92149c2156420b628f57 to ↵Android Build Coastguard Worker
main-cg-testing-release" into main-cg-testing-release
2022-03-14Snap for 8294919 from c58c5cc9f519e540651e92149c2156420b628f57 to ↵Android Build Coastguard Worker
main-cg-testing-release Change-Id: Ied4430ebbb81e377f627bf9edb157460e5e9ea30
2021-12-26Merge "Snap for 8029350 from 9962dd71e5531d993132afa4f3ebbe93f24834fb to ↵Android Build Coastguard Worker
main-cg-testing-release" into main-cg-testing-release
2021-12-26Snap for 8029350 from 9962dd71e5531d993132afa4f3ebbe93f24834fb to ↵Android Build Coastguard Worker
main-cg-testing-release Change-Id: Ie98e82e72f7497d1b3401a91b373c988caed8821
2021-12-12Merge "Snap for 7992541 from d89d1246e7142caa1ab98c4145ecf771b448da9b to ↵Android Build Coastguard Worker
main-cg-testing-release" into main-cg-testing-release
2021-12-12Snap for 7992541 from d89d1246e7142caa1ab98c4145ecf771b448da9b to ↵Android Build Coastguard Worker
main-cg-testing-release Change-Id: Ib1173eaf059251cef831f5e5f737bc8a52938b97
2021-12-08Merge "Add updated cpe for vulnerability scanners" am: d89d1246e7 am: ↵Maria Uretsky
9962dd71e5 am: c50a0e9ed0 Original change: https://android-review.googlesource.com/c/platform/external/pcre/+/1911995 Change-Id: Iabad3771a9e013714ebb55c493e7de5e51cfc846
2021-12-08Merge "Add updated cpe for vulnerability scanners" am: d89d1246e7 am: 9962dd71e5Maria Uretsky
Original change: https://android-review.googlesource.com/c/platform/external/pcre/+/1911995 Change-Id: I0e5ee942e61b9157ff37c99ec91aad07e462253f
2021-12-08Merge "Add updated cpe for vulnerability scanners" am: d89d1246e7android-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-1Maria Uretsky
Original change: https://android-review.googlesource.com/c/platform/external/pcre/+/1911995 Change-Id: Ic3e0ece940dffb53463e414b897f8ff0a4d4fec8
2021-12-08Merge "Add updated cpe for vulnerability scanners"Maria Uretsky
2021-12-06Add updated cpe for vulnerability scannersMaria Uretsky
Bug: b/201572953 Change-Id: I06d0b38a156d5e05c60003cb9f173096714c601c
2021-10-31Merge "Snap for 7869741 from 8e12681a1a252fd581830b2f65d1e154a2030bb9 to ↵Android Build Coastguard Worker
main-cg-testing-release" into main-cg-testing-release
2021-10-31Snap for 7869741 from 8e12681a1a252fd581830b2f65d1e154a2030bb9 to ↵Android Build Coastguard Worker
main-cg-testing-release Change-Id: Ic018a894eecdc9485fa42f217df201d88a17f56e
2021-10-29Merge "Upgrade pcre to pcre2-10.39" am: 8e12681a1a am: c367b71949 am: ↵Elliott Hughes
d0bb346e0e am: d6cfff99ba Original change: https://android-review.googlesource.com/c/platform/external/pcre/+/1875535 Change-Id: I9f7793996853fbe8768be995c07f81bdbae7920a
2021-10-29Merge "Upgrade pcre to pcre2-10.39" am: 8e12681a1a am: c367b71949 am: d0bb346e0eElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/pcre/+/1875535 Change-Id: Ie561cadacb6bd5f299a0d928e7d1b7cf488ec61e
2021-10-29Merge "Upgrade pcre to pcre2-10.39" am: 8e12681a1a am: c367b71949Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/pcre/+/1875535 Change-Id: I027a8c88afb389f0771bc27cedb35ed591f30bc7
2021-10-29Merge "Upgrade pcre to pcre2-10.39" am: 8e12681a1aElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/pcre/+/1875535 Change-Id: I4b3a30aacf32fa4c95252a5fe0cf12aa4bb45797
2021-10-29Merge "Upgrade pcre to pcre2-10.39"Elliott Hughes
2021-10-29Upgrade pcre to pcre2-10.39Elliott Hughes
Test: make Change-Id: I05a74df534efc6d9303ad035797fcf19e9c82bcd
2021-10-10Merge "Snap for 7810574 from 02a1009488494526531c1946c0ae5846fa0dd572 to ↵Android Build Coastguard Worker
main-cg-testing-release" into main-cg-testing-release
2021-10-10Snap for 7810574 from 02a1009488494526531c1946c0ae5846fa0dd572 to ↵Android Build Coastguard Worker
main-cg-testing-release Change-Id: Ie8519b3570ebbeceef15c04c0ecb0d47a8efd8fb
2021-10-03Merge "Snap for 7789152 from 20935b73fe93bb60f934a329b35493da6cbf7bf8 to ↵Android Build Coastguard Worker
main-cg-testing-release" into main-cg-testing-release
2021-10-03Snap for 7789152 from 20935b73fe93bb60f934a329b35493da6cbf7bf8 to ↵Android Build Coastguard Worker
main-cg-testing-release Change-Id: I794a99a1777d60da6428553f453b3dc9b32dccf3
2021-10-01Merge "Upgrade pcre to pcre2-10.38" am: 20935b73fe am: 02a1009488 am: ↵Elliott Hughes
2c910a1b0f am: b37d83a5d8 Original change: https://android-review.googlesource.com/c/platform/external/pcre/+/1843561 Change-Id: Ibd37ae2ce8bb6f3305484e1b1e7fa1dc92ff1ff6
2021-10-01Merge "Upgrade pcre to pcre2-10.38" am: 20935b73fe am: 02a1009488 am: 2c910a1b0fElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/pcre/+/1843561 Change-Id: If364b63127535c8ab3c194dd2bc39dceab58bb5d
2021-10-01Merge "Upgrade pcre to pcre2-10.38" am: 20935b73fe am: 02a1009488Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/pcre/+/1843561 Change-Id: Iae28d15f193af8c6055d1c3d338eac65a1ef58e6
2021-10-01Merge "Upgrade pcre to pcre2-10.38" am: 20935b73feandroid-s-v2-preview-2android-s-v2-preview-1android-s-v2-beta-2android-s-v2-preview-1Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/pcre/+/1843561 Change-Id: Ie1839c4d8bc294a480d6310ef75a03bfc2795d05
2021-10-01Merge "Upgrade pcre to pcre2-10.38"Elliott Hughes
2021-10-01Upgrade pcre to pcre2-10.38Elliott Hughes
Test: make Change-Id: I1cb524c3df2d19432f1ae20ccd243765806253a6
2021-08-22Merge "Snap for 7664297 from 5a3af68c6b96079dfadaca848b8660cf76de320b to ↵Android Build Coastguard Worker
main-cg-testing-release" into main-cg-testing-release
2021-08-22Snap for 7664297 from 5a3af68c6b96079dfadaca848b8660cf76de320b to ↵Android Build Coastguard Worker
main-cg-testing-release Change-Id: I3dc8b5bc828f23575dbcef5945f0bf75bbd17c28
2021-07-22Merge "Move system_shared_libs into target.bionic clause" am: 5a3af68c6b am: ↵Treehugger Robot
9eec5e84bb am: ecdfb371da Original change: https://android-review.googlesource.com/c/platform/external/pcre/+/1765051 Change-Id: I1bcf58b5057ef94d564f690d8bbf4b804c11de6a
2021-07-22Merge "Move system_shared_libs into target.bionic clause" am: 5a3af68c6b am: ↵Treehugger Robot
9eec5e84bb Original change: https://android-review.googlesource.com/c/platform/external/pcre/+/1765051 Change-Id: I3afaa66846e523da6853bae4db2f56c926248e98
2021-07-22Merge "Move system_shared_libs into target.bionic clause" am: 5a3af68c6bTreehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/pcre/+/1765051 Change-Id: I6c470bb1b020deb1a8ca024d54a7eb7b943ac786
2021-07-22Merge "Move system_shared_libs into target.bionic clause"android-s-beta-5android-s-beta-5Treehugger Robot
2021-07-13Move system_shared_libs into target.bionic clauseColin Cross
Use target.bionic.system_shared_libs when it is used to limit the default shared libraries (as opposed to remove them completely). This avoids attempting to add a host dependency on libc when system_shared_libs is modified to apply to all variants. Bug: 193559105 Test: m checkbuild Change-Id: I6cf8e90424431b5abb8ddb32dbf7dfd7a4b8570a
2021-06-09Merge "Upgrade to pcre2-10.37 (2021-05-26)." am: efc31d64b3 am: 465fb3954c ↵Elliott Hughes
am: 7a714da48f Original change: https://android-review.googlesource.com/c/platform/external/pcre/+/1729574 Change-Id: Idd70da75917b42dfcecf2fa795d1edd97ac9307f
2021-06-09Merge "Upgrade to pcre2-10.37 (2021-05-26)." am: efc31d64b3 am: 465fb3954cElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/pcre/+/1729574 Change-Id: I61649d18e8aa970a20ffff30546f489c18c12a2b
2021-06-09Merge "Upgrade to pcre2-10.37 (2021-05-26)." am: efc31d64b3android-s-beta-4android-s-beta-3android-s-beta-4Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/pcre/+/1729574 Change-Id: I5bfbf645f92935f6a1edf8a393ebc96b481f15e8
2021-06-09Merge "Upgrade to pcre2-10.37 (2021-05-26)."Elliott Hughes
2021-06-08Upgrade to pcre2-10.37 (2021-05-26).Elliott Hughes
Test: treehugger Change-Id: Ie8efa917b9531df2cc0e13b3792a5ed8223f5421
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 46790d2eae -s ↵android-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-releaseXin Li
ours am: 9d61b0639d -s ours am skip reason: Change-Id I40c39bf719309394597f6f9c0b93e39921039103 with SHA-1 f0deaf70cb is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I814b9c602a0d6c74e1ebfe25c9f72a5f1e8a60a1
2021-02-20[automerger skipped] Mark ab/7061308 as merged in stage. am: 46790d2eae -s oursXin Li
am skip reason: Change-Id I40c39bf719309394597f6f9c0b93e39921039103 with SHA-1 f0deaf70cb is in history Original change: undetermined MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: Icbe4d684f1c4a3c7bbe01919390fc8cf198e27c5
2021-02-20Mark ab/7061308 as merged in stage.android-s-beta-2android-s-beta-1Xin Li
Bug: 180401296 Merged-In: I40c39bf719309394597f6f9c0b93e39921039103 Change-Id: I4e2f2a3ecb2253180060c6f2fe5591f6fb8e7c15
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 10:21:15 +0000