summaryrefslogtreecommitdiff
AgeCommit message (Collapse)Author
2023-12-06Snap for 11180250 from 07be7766cf49e4d4bab20c2d2c8530662e7f4ab3 to 24Q1-releaseandroid-14.0.0_r37android-14.0.0_r36android-14.0.0_r35android-14.0.0_r34android-14.0.0_r33android-14.0.0_r32android-14.0.0_r31android-14.0.0_r30android-14.0.0_r29android14-qpr2-s5-releaseandroid14-qpr2-s4-releaseandroid14-qpr2-s3-releaseandroid14-qpr2-s2-releaseandroid14-qpr2-s1-releaseandroid14-qpr2-releaseAndroid Build Coastguard Worker
Change-Id: I07d071ee41aab24179a917b28ec11903d4e91ac3
2023-12-05Merge "Prevent libz from providing stubs for vendor/product modules" into ↵Treehugger Robot
main am: 95dcfbd56b am: b7280f5a7b am: 474f333e28 Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2853111 Change-Id: Ib6371d019f022f82713364eeb1efaeacd1961299 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Prevent libz from providing stubs for vendor/product modules" into ↵Treehugger Robot
main am: 95dcfbd56b am: b7280f5a7b Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2853111 Change-Id: I501e44207b7a162efa9bb423fbb9b19de596adfc Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Prevent libz from providing stubs for vendor/product modules" into ↵Treehugger Robot
main am: 95dcfbd56b am: af9c6d3cf6 am: 650d1bba03 Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2853111 Change-Id: I21b3bc1d695c271145a88cf130229744662ffc75 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Prevent libz from providing stubs for vendor/product modules" into ↵Treehugger Robot
main am: 95dcfbd56b Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2853111 Change-Id: I53f9fec70457a9875b50cea94263ea0d708e615c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Prevent libz from providing stubs for vendor/product modules" into ↵Treehugger Robot
main am: 95dcfbd56b am: af9c6d3cf6 Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2853111 Change-Id: I8a174e1fbd762817ffd7ed97e31b6e14fcae54b4 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Prevent libz from providing stubs for vendor/product modules" into ↵Treehugger Robot
main am: 95dcfbd56b Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2853111 Change-Id: Idba8f77d32718d64e59eff9804009e9f8f748fec Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-12-05Merge "Prevent libz from providing stubs for vendor/product modules" into mainTreehugger Robot
2023-12-01Prevent libz from providing stubs for vendor/product modulesJooyung Han
libz is not an LLNDK. So even if it has "stubs" set, it should not provide stubs to vendor/product modules. This is important especially to venodr/product APEXes. When used by a Vendor apex, libz should be bundled together with the apex, not used from /system/lib or /vendor/lib. Bug: 313806237 Test: m Change-Id: I49961320e43ebce8093a0ca7641d53bf184242e8
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 9760bae4db -s ↵Xin Li
ours am: c8da996faf -s ours am: cbcdff06a8 -s ours am: 5d6fba8ef8 -s ours am skip reason: Merged-In I69f0329190e2e64777ea2b8227f2c92f63935ecd with SHA-1 e711a87b37 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/24086515 Change-Id: Ideec05121ea4dbef250c6ff2301b56accd29103d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 9760bae4db -s ↵Xin Li
ours am: c8da996faf -s ours am: cbcdff06a8 -s ours am skip reason: Merged-In I69f0329190e2e64777ea2b8227f2c92f63935ecd with SHA-1 e711a87b37 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/24086515 Change-Id: Ic625bae78e7663869916ba2fdb0baa66b7ae6c54 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 9760bae4db -s ↵Xin Li
ours am: c8da996faf -s ours am skip reason: Merged-In I69f0329190e2e64777ea2b8227f2c92f63935ecd with SHA-1 e711a87b37 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/24086515 Change-Id: Icb2bc9943c62cf3606d26354db34f35951bfe711 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-15[automerger skipped] Empty Merge Android U (ab/10368041) am: 9760bae4db -s oursXin Li
am skip reason: Merged-In I69f0329190e2e64777ea2b8227f2c92f63935ecd with SHA-1 e711a87b37 is already in history Original change: https://googleplex-android-review.googlesource.com/c/platform/external/zlib/+/24086515 Change-Id: Iec682662566da41db7efe6acf36e3b00c2ffc469 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-14Empty Merge Android U (ab/10368041)studio-2024.1.2-canary1studio-2024.1.1-canary8studio-2024.1.1-canary6studio-2024.1.1-beta2studio-2023.3.1-rc2studio-2023.3.1-canary8studio-2023.3.1-canary03studio-2023.3.1Xin Li
Bug: 291102124 Merged-In: I69f0329190e2e64777ea2b8227f2c92f63935ecd Change-Id: I64656f0a01e70c9c575b0997e7ab9f8e75d144fc
2023-07-13Merge "Remove minigzip." into main am: cfa5de0e20 am: 99cc12ad97 am: ↵Elliott Hughes
7c39fbba8c am: bcaaa49b0f am: 8002fba7ce am: 2fcce6cce0 Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2631751 Change-Id: Ida209aa8e3c5a985a1ea5d1691a430fe54eb999b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13Merge "Remove minigzip." into main am: cfa5de0e20 am: 99cc12ad97 am: ↵Elliott Hughes
7c39fbba8c am: bcaaa49b0f am: 8002fba7ce Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2631751 Change-Id: I9a9d102794f4d70b9e86c231472e4bf20c281e62 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13Merge "Remove minigzip." into main am: cfa5de0e20 am: 99cc12ad97 am: ↵Elliott Hughes
7c39fbba8c am: bcaaa49b0f Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2631751 Change-Id: I04e3aa36727079e5d439dabaab1ff68efbe9c0ed Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13Merge "Remove minigzip." into main am: cfa5de0e20 am: 99cc12ad97 am: 7c39fbba8cElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2631751 Change-Id: Ifbd6e8bc0686d6080b8566c66736bdf0200ef545 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13Merge "Remove minigzip." into main am: cfa5de0e20 am: 99cc12ad97Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2631751 Change-Id: Iccc9ea1501063710edff5ca1c6eee708a2c18264 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13Merge "Remove minigzip." into main am: cfa5de0e20Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2631751 Change-Id: I48f81a46cc5cc0a83e04d6949d976ad3a64acf5e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-13Merge "Remove minigzip." into mainElliott Hughes
2023-06-20Remove minigzip.Elliott Hughes
This isn't in upstream zlib (it's in _their_ upstream, but they removed it and we restored it). There's no reason for us not to use toybox's gzip now. Bug: http://b/288169261 Test: treehugger Change-Id: Ibaea89b0387e0c927790c358df2b92fc990ee556
2023-05-19Merge "Enable the last fuzzer now the build is fixed." am: aa46c919a5 am: ↵Elliott Hughes
dff4be8ee8 am: 86e5a7dcbf am: e711a87b37 am: 9a2fab4474 am: f0dbc4c2a4 Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2592186 Change-Id: Iac2959d64bb172eff5e993f2e7fd6308eea56f45 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-19Merge "Enable the last fuzzer now the build is fixed." am: aa46c919a5 am: ↵Elliott Hughes
dff4be8ee8 am: 86e5a7dcbf am: e711a87b37 am: 9a2fab4474 Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2592186 Change-Id: I3f61a2ede26fa83799fee326e10651f3f441e7d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18Merge "Enable the last fuzzer now the build is fixed." am: aa46c919a5 am: ↵Elliott Hughes
dff4be8ee8 am: 86e5a7dcbf am: e711a87b37 Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2592186 Change-Id: Ie1011594d09633f88841922c833eee9dd5639c38 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18Merge "Enable the last fuzzer now the build is fixed." am: aa46c919a5 am: ↵Elliott Hughes
dff4be8ee8 am: 86e5a7dcbf Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2592186 Change-Id: I69f0329190e2e64777ea2b8227f2c92f63935ecd Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18Merge "Enable the last fuzzer now the build is fixed." am: aa46c919a5 am: ↵Elliott Hughes
dff4be8ee8 Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2592186 Change-Id: I6b240d662df83f7eb3d2675d0c9a8cc61628e7d7 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18Merge "Enable the last fuzzer now the build is fixed." am: aa46c919a5Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2592186 Change-Id: I5e6d3892b2c0b343e13ad2b6371d2670383d3e2b Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-18Merge "Enable the last fuzzer now the build is fixed."Elliott Hughes
2023-05-17Merge "Upgrade zlib to 14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f" am: ↵Treehugger Robot
46e555b190 am: 1ff118d107 am: 0e5194fae5 am: 5f87762e26 am: 149df9fc10 am: 69bd35a79a Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2592925 Change-Id: Idc2974a34a6a8df21037093a304886b69a0f6cd2 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17Merge "Upgrade zlib to 14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f" am: ↵Treehugger Robot
46e555b190 am: 1ff118d107 am: 0e5194fae5 am: 5f87762e26 am: 149df9fc10 Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2592925 Change-Id: Iee91f50f48fe81e5fa86f1a90782c7a8293b643e Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17Merge "Upgrade zlib to 14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f" am: ↵Treehugger Robot
46e555b190 am: 1ff118d107 am: 0e5194fae5 am: 5f87762e26 Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2592925 Change-Id: I41c6e098140e36d79e706a3e594cc0c28fcd797c Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17Merge "Upgrade zlib to 14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f" am: ↵Treehugger Robot
46e555b190 am: 1ff118d107 am: 0e5194fae5 Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2592925 Change-Id: I228a561919465ead0a0ba682d6df3c1882cf1fef Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17Merge "Upgrade zlib to 14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f" am: ↵Treehugger Robot
46e555b190 am: 1ff118d107 Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2592925 Change-Id: I060472b1a56aa69aa7c5c1460e429ecb64e36187 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17Merge "Upgrade zlib to 14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f" am: 46e555b190Treehugger Robot
Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2592925 Change-Id: Ia5895c5b45e15e3eaf012d66201b8d2d725b13d1 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-17Merge "Upgrade zlib to 14dd4c4455602c9b71a1a89b5cafd1f4030d2e3f"Treehugger Robot
2023-05-16Enable the last fuzzer now the build is fixed.Elliott Hughes
Test: treehugger Change-Id: I341b8db5ad14be23332c0493c03818124c29e20c
2023-05-16Upgrade zlib to 14dd4c4455602c9b71a1a89b5cafd1f4030d2e3fElliott Hughes
This project was upgraded with external_updater. Usage: tools/external_updater/updater.sh update zlib For more info, check https://cs.android.com/android/platform/superproject/+/master:tools/external_updater/README.md Test: TreeHugger Change-Id: Ied7bc3c26083d7938fa4a7a5b09534b183a9d016
2023-05-09Merge "Upgrade zlib to b890619bc2b193b8fbe9c1c053f4cd19a9791d92" am: ↵Elliott Hughes
81774276a9 am: d833627b2f am: f847a17dd3 am: 2ae6598b3f am: 2b7b16000d am: ed8e75b3c2 Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2523495 Change-Id: I9e8e7caea8176a9d8283ce33c833bcd69c0e35a5 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09Merge "Upgrade zlib to b890619bc2b193b8fbe9c1c053f4cd19a9791d92" am: ↵Elliott Hughes
81774276a9 am: d833627b2f am: f847a17dd3 am: 2ae6598b3f am: 2b7b16000d Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2523495 Change-Id: I77c771ff27042897c8894a7dd92ee44ea48de5d8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09Merge "Upgrade zlib to b890619bc2b193b8fbe9c1c053f4cd19a9791d92" am: ↵Elliott Hughes
81774276a9 am: d833627b2f am: f847a17dd3 am: 2ae6598b3f Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2523495 Change-Id: I5ad16b14c2248ef35212b84667fffdcd2fb2e2a9 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09Merge "Upgrade zlib to b890619bc2b193b8fbe9c1c053f4cd19a9791d92" am: ↵Elliott Hughes
81774276a9 am: d833627b2f am: f847a17dd3 Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2523495 Change-Id: I071565300cb082a27e15341c7dcdd9841381ed1d Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09Merge "Upgrade zlib to b890619bc2b193b8fbe9c1c053f4cd19a9791d92" am: ↵Elliott Hughes
81774276a9 am: d833627b2f Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2523495 Change-Id: I61d98fd489f1585a355f42ee8e90cd961f23eca6 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-09Merge "Upgrade zlib to b890619bc2b193b8fbe9c1c053f4cd19a9791d92" am: 81774276a9Elliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2523495 Change-Id: Id2fced2d7301981aace68afd3d791b98a3defda8 Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-08Merge "Upgrade zlib to b890619bc2b193b8fbe9c1c053f4cd19a9791d92"Elliott Hughes
2023-04-11Merge "Build inflate_fuzzer too." am: 01da30164d am: ea84869530 am: ↵Elliott Hughes
fa55db7eaa am: b6f3ad40ea am: 10f46bb60b Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2526352 Change-Id: I78666b83ea7472e63e53840fd9d8f418ce29c6fa Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11Merge "Build inflate_fuzzer too." am: 01da30164d am: ea84869530 am: ↵Elliott Hughes
fa55db7eaa am: b6f3ad40ea am: fdb5887e56 Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2526352 Change-Id: I831388f1800866764b8d2608bad569381f1a09ca Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11Merge "Build inflate_fuzzer too." am: 01da30164d am: ea84869530 am: ↵android-14.0.0_r45android-14.0.0_r44android-14.0.0_r43android-14.0.0_r42android-14.0.0_r41android-14.0.0_r40android-14.0.0_r39android-14.0.0_r38android-14.0.0_r27android-14.0.0_r26android-14.0.0_r25android-14.0.0_r24android-14.0.0_r23android-14.0.0_r22android-14.0.0_r21android-14.0.0_r20android-14.0.0_r19android-14.0.0_r18android-14.0.0_r17android-14.0.0_r16android14-qpr1-s2-releaseandroid14-qpr1-releaseandroid14-d2-s5-releaseandroid14-d2-s4-releaseandroid14-d2-s3-releaseandroid14-d2-s2-releaseandroid14-d2-s1-releaseandroid14-d2-releaseElliott Hughes
fa55db7eaa am: b6f3ad40ea Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2526352 Change-Id: I1c24e6c253f97781f063b2ecc769135b89c9a3ac Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11Merge "Build inflate_fuzzer too." am: 01da30164d am: ea84869530 am: ↵Elliott Hughes
fa55db7eaa am: b6f3ad40ea Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2526352 Change-Id: I6ed0f55ce3b969b11ca1c57cfaa19db99a9a93ba Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-11Merge "Build inflate_fuzzer too." am: 01da30164d am: ea84869530 am: fa55db7eaaandroid14-devElliott Hughes
Original change: https://android-review.googlesource.com/c/platform/external/zlib/+/2526352 Change-Id: I8bc0abae4a401d9841d6dca14a117d04c449b2e8 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-30 13:23:15 +0000