)]}' { "log": [ { "commit": "f0b4202abcd416e8d0099583c309fbfa4ac516e5", "tree": "0681105ceea250107ba05c43867e280e9da2d691", "parents": [ "f99d5860103a097a67d1020eb801178f930291ab" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Wed Dec 18 20:33:56 2024 +0000" }, "committer": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Wed Dec 18 20:33:56 2024 +0000" }, "message": "Add janitors to the OWNERS file\n\nTest: TreeHugger\nChange-Id: I5de668c41fb7f6acbc1010ec8fffe1f92ff6dfd8\n" }, { "commit": "f99d5860103a097a67d1020eb801178f930291ab", "tree": "4fa4837aea60912d1997318ae6c8c84fba7b0a1d", "parents": [ "1c9d932003f92206963f032377d52934001a5bb7", "cd4dcab1791498dddc2f1d5150484b8a261e8f8a" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Oct 25 21:07:12 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 25 21:07:12 2024 +0000" }, "message": "Fix cpython2 for C23. am: cd4dcab179\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/3320777\n\nChange-Id: Ic63e654e24b1d493c3c634feefd0b2862a764327\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cd4dcab1791498dddc2f1d5150484b8a261e8f8a", "tree": "4fa4837aea60912d1997318ae6c8c84fba7b0a1d", "parents": [ "6f48e2c5e48a9137c6d43bd3b424300c61ded495" ], "author": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Oct 25 14:37:31 2024 -0400" }, "committer": { "name": "Elliott Hughes", "email": "enh@google.com", "time": "Fri Oct 25 14:37:31 2024 -0400" }, "message": "Fix cpython2 for C23.\n\nI could just pin this project to C17, but since the header in question\nclaims it\u0027s used in _generated_ code, making that compatible with\nanything \u003e\u003d C99 seemed like the best option.\n\n(At least until such time as we can delete cpython2!)\n\nChange-Id: I84a87e8baa0cdcccfff0ddc47079183dd8c41220\n" }, { "commit": "1c9d932003f92206963f032377d52934001a5bb7", "tree": "115b30b41a2d1214a6dce311c9a98df84bbeefdc", "parents": [ "0cabb4528d3eef59b82e134cedd6b8c75fd970f9", "6f48e2c5e48a9137c6d43bd3b424300c61ded495" ], "author": { "name": "Pirama Arumuga Nainar", "email": "pirama@google.com", "time": "Wed Aug 28 23:47:25 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 28 23:47:25 2024 +0000" }, "message": "Revert^2 \"Disable -Wno-single-bit-bitfield-constant-conversion locally\" am: c5cc7fc413 am: 6f48e2c5e4\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/3247806\n\nChange-Id: I4d8d1fd70b7b030858291e7b43e7d000d50f6d43\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6f48e2c5e48a9137c6d43bd3b424300c61ded495", "tree": "115b30b41a2d1214a6dce311c9a98df84bbeefdc", "parents": [ "078e9491478288216e05d5a15790161eeb6dee2b", "c5cc7fc4134330b97fde4800311e508c5345d8ec" ], "author": { "name": "Pirama Arumuga Nainar", "email": "pirama@google.com", "time": "Wed Aug 28 23:38:53 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 28 23:38:53 2024 +0000" }, "message": "Revert^2 \"Disable -Wno-single-bit-bitfield-constant-conversion locally\" am: c5cc7fc413\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/3247806\n\nChange-Id: I4eb6b8ad9f43fa0087e966eeb85aa8e8c21100d9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c5cc7fc4134330b97fde4800311e508c5345d8ec", "tree": "115b30b41a2d1214a6dce311c9a98df84bbeefdc", "parents": [ "c667749398f76b05bb2e72115d9491118ed0d197" ], "author": { "name": "Pirama Arumuga Nainar", "email": "pirama@google.com", "time": "Wed Aug 28 22:42:01 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Aug 28 22:42:01 2024 +0000" }, "message": "Revert^2 \"Disable -Wno-single-bit-bitfield-constant-conversion locally\"\n\nThis reverts commit c667749398f76b05bb2e72115d9491118ed0d197.\n\nReason for revert: This change was reverted along with the soong flag switch even though it is safe to merge.\n\nChange-Id: Ia4dbe7fc39361900e1f48636be9ffe65453c2c9d\n" }, { "commit": "0cabb4528d3eef59b82e134cedd6b8c75fd970f9", "tree": "9e6689617c3898b299506cbf0dea820c812ddfbe", "parents": [ "1ff86da4416cfad99cc11baa00dbe0a4e1cf1b39", "078e9491478288216e05d5a15790161eeb6dee2b" ], "author": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Wed Aug 28 22:09:26 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 28 22:09:26 2024 +0000" }, "message": "Revert \"Disable -Wno-single-bit-bitfield-constant-conversion locally\" am: c667749398 am: 078e949147\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/3249252\n\nChange-Id: I0cdf42f8257017dce579984797594f78d71d92b9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "078e9491478288216e05d5a15790161eeb6dee2b", "tree": "9e6689617c3898b299506cbf0dea820c812ddfbe", "parents": [ "59e93988ecc9efe523399414dfae532f0546a764", "c667749398f76b05bb2e72115d9491118ed0d197" ], "author": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Wed Aug 28 22:01:02 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 28 22:01:02 2024 +0000" }, "message": "Revert \"Disable -Wno-single-bit-bitfield-constant-conversion locally\" am: c667749398\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/3249252\n\nChange-Id: I2e0efbc2e634f881b2effbf07fcf3fe32389153f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "c667749398f76b05bb2e72115d9491118ed0d197", "tree": "9e6689617c3898b299506cbf0dea820c812ddfbe", "parents": [ "e190c6100bb95f0be5aae4aa385a30411314bb1c" ], "author": { "name": "Priyanka Advani (xWF)", "email": "padvani@google.com", "time": "Wed Aug 28 21:44:53 2024 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Aug 28 21:44:56 2024 +0000" }, "message": "Revert \"Disable -Wno-single-bit-bitfield-constant-conversion locally\"\n\nRevert submission 3238689-bitfield-warning-cleanup\n\nReason for revert: Droidmonitor created revert due to b/362819160.\n\nReverted changes: /q/submissionid:3238689-bitfield-warning-cleanup\n\nChange-Id: I0ba31fed2b010b12e4dc492c39de0c643f98b817\n" }, { "commit": "1ff86da4416cfad99cc11baa00dbe0a4e1cf1b39", "tree": "115b30b41a2d1214a6dce311c9a98df84bbeefdc", "parents": [ "6a25c9f232191e903edc83fa4069c48dcb67d18a", "59e93988ecc9efe523399414dfae532f0546a764" ], "author": { "name": "Pirama Arumuga Nainar", "email": "pirama@google.com", "time": "Wed Aug 28 20:39:53 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 28 20:39:53 2024 +0000" }, "message": "Disable -Wno-single-bit-bitfield-constant-conversion locally am: e190c6100b am: 59e93988ec\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/3237111\n\nChange-Id: I1c97a1f966bfc226094cb0b85cc30d6aca473d52\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "59e93988ecc9efe523399414dfae532f0546a764", "tree": "115b30b41a2d1214a6dce311c9a98df84bbeefdc", "parents": [ "6a25c9f232191e903edc83fa4069c48dcb67d18a", "e190c6100bb95f0be5aae4aa385a30411314bb1c" ], "author": { "name": "Pirama Arumuga Nainar", "email": "pirama@google.com", "time": "Wed Aug 28 20:31:32 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Aug 28 20:31:32 2024 +0000" }, "message": "Disable -Wno-single-bit-bitfield-constant-conversion locally am: e190c6100b\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/3237111\n\nChange-Id: Id900dccbb6dfdd1d5ac67ebd82abec96aa6b3875\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e190c6100bb95f0be5aae4aa385a30411314bb1c", "tree": "115b30b41a2d1214a6dce311c9a98df84bbeefdc", "parents": [ "4b1517814484fb8b81293984f23ff5142360a988" ], "author": { "name": "Pirama Arumuga Nainar", "email": "pirama@google.com", "time": "Fri Aug 23 05:47:12 2024 +0000" }, "committer": { "name": "Pirama Arumuga Nainar", "email": "pirama@google.com", "time": "Fri Aug 23 05:49:26 2024 +0000" }, "message": "Disable -Wno-single-bit-bitfield-constant-conversion locally\n\n...so it can be enabled globally.\n\nBug: 243965903\nTest: presubmit\nChange-Id: I795a1a9e9066e9034c3612efad9d1435acd91e91\n" }, { "commit": "6a25c9f232191e903edc83fa4069c48dcb67d18a", "tree": "9e6689617c3898b299506cbf0dea820c812ddfbe", "parents": [ "c681c8112f480fca4287696914c7f38b0eb64bf1", "4b1517814484fb8b81293984f23ff5142360a988" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 23:12:58 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Apr 29 23:12:58 2024 +0000" }, "message": "[automerger skipped] Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future am: 4b15178144 -s ours\n\nam skip reason: Merged-In Iaa5f67add017b4fb577944c2d51b0d6115c0c1ad with SHA-1 02716d1346 is already in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/python/cpython2/+/27144828\n\nChange-Id: I1f302bc026c6491ebe47ba6eb9c0ac9f3de45f32\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "4b1517814484fb8b81293984f23ff5142360a988", "tree": "9e6689617c3898b299506cbf0dea820c812ddfbe", "parents": [ "02716d134676571e8572d7de85022f49eb39b0cb", "c681c8112f480fca4287696914c7f38b0eb64bf1" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:50:28 2024 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Apr 29 11:50:28 2024 -0700" }, "message": "Empty merge of Android 24Q2 Release (ab/11526283) to aosp-main-future\n\nBug: 337098550\nMerged-In: Iaa5f67add017b4fb577944c2d51b0d6115c0c1ad\nChange-Id: I71c07c992c43d491c13d085ab270e214ecf335b6\n" }, { "commit": "c681c8112f480fca4287696914c7f38b0eb64bf1", "tree": "9e6689617c3898b299506cbf0dea820c812ddfbe", "parents": [ "c62c5166f24ba15e16d76b6bfc8b2234c7be6239", "02716d134676571e8572d7de85022f49eb39b0cb" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Thu Feb 22 22:30:39 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 22 22:30:39 2024 +0000" }, "message": "Update OWNERS file am: b9837e3a60 am: 02716d1346\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2973994\n\nChange-Id: Id171e43d07931214b69bb306798227da9e2fdf83\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "02716d134676571e8572d7de85022f49eb39b0cb", "tree": "9e6689617c3898b299506cbf0dea820c812ddfbe", "parents": [ "c62c5166f24ba15e16d76b6bfc8b2234c7be6239", "b9837e3a6023c68f9935f2423f86ff231bf58bbd" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Thu Feb 22 21:49:04 2024 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 22 21:49:04 2024 +0000" }, "message": "Update OWNERS file am: b9837e3a60\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2973994\n\nChange-Id: Iaa5f67add017b4fb577944c2d51b0d6115c0c1ad\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b9837e3a6023c68f9935f2423f86ff231bf58bbd", "tree": "9e6689617c3898b299506cbf0dea820c812ddfbe", "parents": [ "53b05086329701c62b8b849b1b4b4d39f518b2c4" ], "author": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Thu Feb 22 19:35:30 2024 +0000" }, "committer": { "name": "Sadaf Ebrahimi", "email": "sadafebrahimi@google.com", "time": "Thu Feb 22 19:35:30 2024 +0000" }, "message": "Update OWNERS file\n\nRemove Xooglers chh and nanzhang\n\nTest: TreeHugger\nChange-Id: Ib4a3ba6507841edab7dc57211d251c95b20ecead\n" }, { "commit": "c62c5166f24ba15e16d76b6bfc8b2234c7be6239", "tree": "76d60b13fb8d3c94aadc9c0c4c01cefc017eef19", "parents": [ "bd944b0126e654c41e3daf574cfec97413cb4c24", "08c5695242406db0694cdd9263f560609d793698" ], "author": { "name": "Michael Hoisie", "email": "hoisie@google.com", "time": "Mon Nov 27 22:25:21 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 27 22:25:21 2023 +0000" }, "message": "Switch py2-launcher to use libsqlite_static_noicu am: 61f3a0e64b am: 2dcb4cebaf am: 08c5695242\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2837192\n\nChange-Id: I7cc839d6be20eae53580423dea034e139d800f86\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "08c5695242406db0694cdd9263f560609d793698", "tree": "76d60b13fb8d3c94aadc9c0c4c01cefc017eef19", "parents": [ "cba0f8524259c46bf96006c6709a079019f6ba6d", "2dcb4cebaf7900ac6d45ac20159b2acabae01624" ], "author": { "name": "Michael Hoisie", "email": "hoisie@google.com", "time": "Mon Nov 27 22:24:02 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 27 22:24:02 2023 +0000" }, "message": "Switch py2-launcher to use libsqlite_static_noicu am: 61f3a0e64b am: 2dcb4cebaf\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2837192\n\nChange-Id: I606c0cef45d97b7b0997735bc91cf8e82ad1bbb8\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "bd944b0126e654c41e3daf574cfec97413cb4c24", "tree": "76d60b13fb8d3c94aadc9c0c4c01cefc017eef19", "parents": [ "24e56a881db024fcce7e66792c86994df2ebd15c", "cba0f8524259c46bf96006c6709a079019f6ba6d" ], "author": { "name": "Michael Hoisie", "email": "hoisie@google.com", "time": "Mon Nov 27 22:23:21 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 27 22:23:21 2023 +0000" }, "message": "Switch py2-launcher to use libsqlite_static_noicu am: 61f3a0e64b am: 53b0508632 am: cba0f85242\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2837192\n\nChange-Id: Ie5219601e53ca4a0755664040e69acbece3a77d1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cba0f8524259c46bf96006c6709a079019f6ba6d", "tree": "76d60b13fb8d3c94aadc9c0c4c01cefc017eef19", "parents": [ "24e56a881db024fcce7e66792c86994df2ebd15c", "53b05086329701c62b8b849b1b4b4d39f518b2c4" ], "author": { "name": "Michael Hoisie", "email": "hoisie@google.com", "time": "Mon Nov 27 21:49:10 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 27 21:49:10 2023 +0000" }, "message": "Switch py2-launcher to use libsqlite_static_noicu am: 61f3a0e64b am: 53b0508632\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2837192\n\nChange-Id: Ie9cb3e03777e0f605354adbed67ea4990dbcb4ee\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "2dcb4cebaf7900ac6d45ac20159b2acabae01624", "tree": "76d60b13fb8d3c94aadc9c0c4c01cefc017eef19", "parents": [ "24e56a881db024fcce7e66792c86994df2ebd15c", "61f3a0e64b50882be7ca6cf82b830084c760bc9d" ], "author": { "name": "Michael Hoisie", "email": "hoisie@google.com", "time": "Mon Nov 27 21:42:35 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 27 21:42:35 2023 +0000" }, "message": "Switch py2-launcher to use libsqlite_static_noicu am: 61f3a0e64b\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2837192\n\nChange-Id: I42bf5f485c98b71fd39cf44469996c7f8eceae0a\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "53b05086329701c62b8b849b1b4b4d39f518b2c4", "tree": "76d60b13fb8d3c94aadc9c0c4c01cefc017eef19", "parents": [ "24e56a881db024fcce7e66792c86994df2ebd15c", "61f3a0e64b50882be7ca6cf82b830084c760bc9d" ], "author": { "name": "Michael Hoisie", "email": "hoisie@google.com", "time": "Mon Nov 27 21:18:42 2023 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Nov 27 21:18:42 2023 +0000" }, "message": "Switch py2-launcher to use libsqlite_static_noicu am: 61f3a0e64b\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2837192\n\nChange-Id: Ic2095f4fe8dbb5f084038cdfc962424553c73ef9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "61f3a0e64b50882be7ca6cf82b830084c760bc9d", "tree": "76d60b13fb8d3c94aadc9c0c4c01cefc017eef19", "parents": [ "24e56a881db024fcce7e66792c86994df2ebd15c" ], "author": { "name": "Michael Hoisie", "email": "hoisie@google.com", "time": "Sat Nov 18 08:16:36 2023 +0000" }, "committer": { "name": "Michael Hoisie", "email": "hoisie@google.com", "time": "Sat Nov 18 08:20:47 2023 +0000" }, "message": "Switch py2-launcher to use libsqlite_static_noicu\n\nThe \u0027libsqlite\u0027 library for host recently switched on the\nSQLITE_ENABLE_ICU flag, which now requires ICU libraries to be included\nin binaries that link libsqlite statically. Because py2-launcher does\nnot need the ICU extensions, switch to using the\n\u0027libsqlite_static_noicu\u0027 target.\n\nTest: m py2-launcher\n\nBug: 308173442\nChange-Id: I8ede90d7bd7eb016b05e181a6955ff2d3b770e8f\n" }, { "commit": "24e56a881db024fcce7e66792c86994df2ebd15c", "tree": "1c1b7d0a2e5f1093a93d9dbce3366e52528f4422", "parents": [ "34be9e4b0e1f3e40dad6a8d4cd2c5ac99df503bc", "f4c6431b80426d19655ea61e1b5e1505c8b9bbe4" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jul 20 04:09:09 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 20 04:09:09 2022 +0000" }, "message": "Add aarch64-linux-musl configurations for cpython2 am: f78b0c41fd am: f956773443 am: 6f11761619 am: baca0a248d am: f4c6431b80\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2159996\n\nChange-Id: I622b68632379de36ccf2302179caeb74d805011d\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f4c6431b80426d19655ea61e1b5e1505c8b9bbe4", "tree": "1c1b7d0a2e5f1093a93d9dbce3366e52528f4422", "parents": [ "4d5a7eb9b40e0d8c540d05bab0e7f66fddbd0b7e", "baca0a248dad7479dfaed4eb5ba1fa67b82174a7" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jul 20 03:40:49 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 20 03:40:49 2022 +0000" }, "message": "Add aarch64-linux-musl configurations for cpython2 am: f78b0c41fd am: f956773443 am: 6f11761619 am: baca0a248d\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2159996\n\nChange-Id: I90de36bade8e4b34d2e5d6cfb60997996bd2a096\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "baca0a248dad7479dfaed4eb5ba1fa67b82174a7", "tree": "1c1b7d0a2e5f1093a93d9dbce3366e52528f4422", "parents": [ "4d5a7eb9b40e0d8c540d05bab0e7f66fddbd0b7e", "6f11761619fd48fde604ef6166edb237260eab1f" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jul 20 03:24:37 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 20 03:24:37 2022 +0000" }, "message": "Add aarch64-linux-musl configurations for cpython2 am: f78b0c41fd am: f956773443 am: 6f11761619\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2159996\n\nChange-Id: I7028a0b13c8ab16b9d3a6653320b23d4e966e0b1\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "6f11761619fd48fde604ef6166edb237260eab1f", "tree": "1c1b7d0a2e5f1093a93d9dbce3366e52528f4422", "parents": [ "4d5a7eb9b40e0d8c540d05bab0e7f66fddbd0b7e", "f9567734433a32ee2ed7d2a61ad4a1e315e04154" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jul 20 03:06:03 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 20 03:06:03 2022 +0000" }, "message": "Add aarch64-linux-musl configurations for cpython2 am: f78b0c41fd am: f956773443\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2159996\n\nChange-Id: I80fdfe694532e142384fba73812edd8feb06a082\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f9567734433a32ee2ed7d2a61ad4a1e315e04154", "tree": "1c1b7d0a2e5f1093a93d9dbce3366e52528f4422", "parents": [ "4d5a7eb9b40e0d8c540d05bab0e7f66fddbd0b7e", "f78b0c41fd23d84ae525a74fa1f3712657a8e455" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jul 20 02:47:55 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jul 20 02:47:55 2022 +0000" }, "message": "Add aarch64-linux-musl configurations for cpython2 am: f78b0c41fd\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2159996\n\nChange-Id: Ia72ce11dd10b16ad1699bd3908cf11102df603eb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f78b0c41fd23d84ae525a74fa1f3712657a8e455", "tree": "1c1b7d0a2e5f1093a93d9dbce3366e52528f4422", "parents": [ "80d3df0782445a88c1239554f53e94bcc08419e5" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jul 19 14:10:08 2022 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Jul 19 14:43:35 2022 -0700" }, "message": "Add aarch64-linux-musl configurations for cpython2\n\nAdd configuration files generated on an Ubuntu 22.04 aarch64 host.\nThis uses the host clang for now since we don\u0027t have a hermetic\narm64 clang.\n\nBug: 236052820\nTest: cross compiles\nChange-Id: I646826e14f1572ba98b857ad17d5a1d56e3decd7\n" }, { "commit": "34be9e4b0e1f3e40dad6a8d4cd2c5ac99df503bc", "tree": "ac622b504d672fbb8a71f7b35cff965ed5ceffe8", "parents": [ "9d2bccb7b4221ef99325d47bc7b80866ce74bfc4", "287db7598d91803ce1277d654aab5eca22b9c4d1" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Mar 16 00:49:47 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 16 00:49:47 2022 +0000" }, "message": "Tweak linux_glibc properties for musl builds in external/python/cpython2 am: fc6603babf am: 5796352143 am: 80d3df0782 am: 4d5a7eb9b4 am: 287db7598d\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2019538\n\nChange-Id: I1c22be46ec6e8630743d1521f48290d62d53bde7\n" }, { "commit": "287db7598d91803ce1277d654aab5eca22b9c4d1", "tree": "ac622b504d672fbb8a71f7b35cff965ed5ceffe8", "parents": [ "e90d78995e537917f3eaca5479a2efff2893d6b0", "4d5a7eb9b40e0d8c540d05bab0e7f66fddbd0b7e" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Mar 16 00:24:59 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 16 00:24:59 2022 +0000" }, "message": "Tweak linux_glibc properties for musl builds in external/python/cpython2 am: fc6603babf am: 5796352143 am: 80d3df0782 am: 4d5a7eb9b4\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2019538\n\nChange-Id: I9234273096403a530df2cc0645f43db814d7b3e9\n" }, { "commit": "9d2bccb7b4221ef99325d47bc7b80866ce74bfc4", "tree": "ac622b504d672fbb8a71f7b35cff965ed5ceffe8", "parents": [ "e90d78995e537917f3eaca5479a2efff2893d6b0", "4d5a7eb9b40e0d8c540d05bab0e7f66fddbd0b7e" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Mar 16 00:24:31 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Mar 16 00:24:31 2022 +0000" }, "message": "Tweak linux_glibc properties for musl builds in external/python/cpython2 am: fc6603babf am: 5796352143 am: 80d3df0782 am: 4d5a7eb9b4\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2019538\n\nChange-Id: I504c774b2658f204cb371f760e479e8c3a522a9d\n" }, { "commit": "4d5a7eb9b40e0d8c540d05bab0e7f66fddbd0b7e", "tree": "ac622b504d672fbb8a71f7b35cff965ed5ceffe8", "parents": [ "e90d78995e537917f3eaca5479a2efff2893d6b0", "80d3df0782445a88c1239554f53e94bcc08419e5" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Mar 15 23:57:45 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 15 23:57:45 2022 +0000" }, "message": "Tweak linux_glibc properties for musl builds in external/python/cpython2 am: fc6603babf am: 5796352143 am: 80d3df0782\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2019538\n\nChange-Id: I7e1c929900f5e55b71d4118ceaddb663d3892463\n" }, { "commit": "80d3df0782445a88c1239554f53e94bcc08419e5", "tree": "ac622b504d672fbb8a71f7b35cff965ed5ceffe8", "parents": [ "7e37b457ae08d4a3f576bd830e3b3323b8d3c145", "5796352143446ee5e9bda3d9265cf05f640250da" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Mar 15 23:32:29 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 15 23:32:29 2022 +0000" }, "message": "Tweak linux_glibc properties for musl builds in external/python/cpython2 am: fc6603babf am: 5796352143\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2019538\n\nChange-Id: Icce6090b08352b89bde188aeb4a0d5a919130e58\n" }, { "commit": "5796352143446ee5e9bda3d9265cf05f640250da", "tree": "ac622b504d672fbb8a71f7b35cff965ed5ceffe8", "parents": [ "7e37b457ae08d4a3f576bd830e3b3323b8d3c145", "fc6603babfe85b094cfd743e2e60d7cbce35133e" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Mar 15 23:04:21 2022 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 15 23:04:21 2022 +0000" }, "message": "Tweak linux_glibc properties for musl builds in external/python/cpython2 am: fc6603babf\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/2019538\n\nChange-Id: I4fc4c1af6f9d531ecebb7fbd53624d2b75424fa1\n" }, { "commit": "fc6603babfe85b094cfd743e2e60d7cbce35133e", "tree": "ac622b504d672fbb8a71f7b35cff965ed5ceffe8", "parents": [ "7e37b457ae08d4a3f576bd830e3b3323b8d3c145" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Mar 08 15:12:47 2022 -0800" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Tue Mar 15 14:19:47 2022 -0700" }, "message": "Tweak linux_glibc properties for musl builds in external/python/cpython2\n\nFor convenience, builds against musl libc currently use the\nlinux_glibc properties because they are almost always linux-specific\nand not glibc-specific. In preparation for removing this hack,\ntweak the linux_glibc properties by either moving them to host_linux,\nwhich will apply to linux_glibc, linux_musl and linux_bionic, or\nby setting appropriate musl or linux_musl properties. Properties\nthat must not be repeated while musl uses linux_musl and also still\nuses the linux_glibc properties are moved to glibc properties, which\ndon\u0027t apply to musl. Whether these stay as glibc properties or get\nmoved back to linux_glibc later once the musl hack is removed is TBD.\n\nBug: 223257095\nTest: m checkbuild\nTest: m USE_HOST_MUSL\u003dtrue host-native\nChange-Id: I1738c5a0e89f5c686eda7fa63da3c2583540dca8\n" }, { "commit": "e90d78995e537917f3eaca5479a2efff2893d6b0", "tree": "3be09f74c282b208781735eda78eff8e944faf6c", "parents": [ "a22fe6656018e07762345de223f58a2a8b524ad4", "7e37b457ae08d4a3f576bd830e3b3323b8d3c145" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jul 29 21:59:49 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 29 21:59:49 2021 +0000" }, "message": "Support compiling python2 against musl am: 66addf4ff3 am: 965ad62600 am: d9205f3aa7 am: 7e37b457ae\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1776890\n\nChange-Id: Ia1833daf0bc3036f32d44ce1740ea82671fd6670\n" }, { "commit": "7e37b457ae08d4a3f576bd830e3b3323b8d3c145", "tree": "3be09f74c282b208781735eda78eff8e944faf6c", "parents": [ "d5d7eafa27a7742c9dc42da34ca240b89558adb2", "d9205f3aa700214fb7f435c873a84bd2a1e70373" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jul 29 21:45:30 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 29 21:45:30 2021 +0000" }, "message": "Support compiling python2 against musl am: 66addf4ff3 am: 965ad62600 am: d9205f3aa7\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1776890\n\nChange-Id: Ib3a9b8120d95b7939bfd85e436503d5dc1f0ac3d\n" }, { "commit": "d9205f3aa700214fb7f435c873a84bd2a1e70373", "tree": "3be09f74c282b208781735eda78eff8e944faf6c", "parents": [ "d5d7eafa27a7742c9dc42da34ca240b89558adb2", "965ad62600f69230e546a846414be6de9d8471df" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jul 29 21:29:52 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 29 21:29:52 2021 +0000" }, "message": "Support compiling python2 against musl am: 66addf4ff3 am: 965ad62600\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1776890\n\nChange-Id: If954f3a00b9b92e36de7a36cd3f3b4caf7ec098b\n" }, { "commit": "965ad62600f69230e546a846414be6de9d8471df", "tree": "3be09f74c282b208781735eda78eff8e944faf6c", "parents": [ "7f55bcf5653b501996ac87fcdbd4bc9093f0391c", "66addf4ff3d09575eae8d0993a02cc9dd752602d" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Jul 29 20:37:37 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jul 29 20:37:37 2021 +0000" }, "message": "Support compiling python2 against musl am: 66addf4ff3\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1776890\n\nChange-Id: I6c0798ecab9e51dc9b2d04bc2a13a6dce05a4416\n" }, { "commit": "66addf4ff3d09575eae8d0993a02cc9dd752602d", "tree": "3be09f74c282b208781735eda78eff8e944faf6c", "parents": [ "7f55bcf5653b501996ac87fcdbd4bc9093f0391c" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Jul 21 18:27:30 2021 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Fri Jul 23 11:47:45 2021 -0700" }, "message": "Support compiling python2 against musl\n\nBug: 190084016\nTest: m out/soong/host/linux-x86/bin/py2-run with musl\nChange-Id: Idf35d26fe79e69fcaee4b9981fef7aae9b1c7f60\n" }, { "commit": "a22fe6656018e07762345de223f58a2a8b524ad4", "tree": "a585dec70bf1ab6a9316cd1b27fa8404c605af34", "parents": [ "7ca8facc663a5c4a0edc73b6744379f972631da8", "f17a9ee1aa3b271f90b5b5812b286a0f632582df" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 02 16:50:26 2021 +0000" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Jun 02 16:50:26 2021 +0000" }, "message": "Merge sc-mainline-prod\n\nBug: 189946434\nChange-Id: I5236888f59fc42b96bad4b2d02d2bbf59c3bd6ae\n" }, { "commit": "f17a9ee1aa3b271f90b5b5812b286a0f632582df", "tree": "a585dec70bf1ab6a9316cd1b27fa8404c605af34", "parents": [ "7d90f21ae24f94683edfb370225e903e1f03f3ff", "d5d7eafa27a7742c9dc42da34ca240b89558adb2" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Mar 09 02:19:01 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 09 02:19:01 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/python/cpython2 am: 84389f6667 am: 7f55bcf565 am: b6a64965e7 am: d5d7eafa27\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1622524\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I200627dc87610ee410e3bda8771ab34cbc8ce018\n" }, { "commit": "7ca8facc663a5c4a0edc73b6744379f972631da8", "tree": "a585dec70bf1ab6a9316cd1b27fa8404c605af34", "parents": [ "56c7998d159104573c91c68fa9c8edef7c46e7bf", "d5d7eafa27a7742c9dc42da34ca240b89558adb2" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Mar 09 02:18:41 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 09 02:18:41 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/python/cpython2 am: 84389f6667 am: 7f55bcf565 am: b6a64965e7 am: d5d7eafa27\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1622524\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ice0c7f9f9c999580a1be3a896166cff608614163\n" }, { "commit": "d5d7eafa27a7742c9dc42da34ca240b89558adb2", "tree": "a585dec70bf1ab6a9316cd1b27fa8404c605af34", "parents": [ "411c271dbcd44a885231f0c2fd20fb1788eae4dd", "b6a64965e726d2240e6451fd0ba55cd6b744fd41" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Mar 09 01:42:06 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 09 01:42:06 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/python/cpython2 am: 84389f6667 am: 7f55bcf565 am: b6a64965e7\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1622524\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Id18b45b9a1c53b8131a0be3399e3cce3d64afa05\n" }, { "commit": "b6a64965e726d2240e6451fd0ba55cd6b744fd41", "tree": "a585dec70bf1ab6a9316cd1b27fa8404c605af34", "parents": [ "1c865c3b9e1dd031c193b51faf60f54189b66bfc", "7f55bcf5653b501996ac87fcdbd4bc9093f0391c" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Mar 09 00:57:20 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 09 00:57:20 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/python/cpython2 am: 84389f6667 am: 7f55bcf565\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1622524\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Iacf81b3683a132dca38a35e8f784e43830097eb4\n" }, { "commit": "7f55bcf5653b501996ac87fcdbd4bc9093f0391c", "tree": "a585dec70bf1ab6a9316cd1b27fa8404c605af34", "parents": [ "4ecd19dd5860ec1a85b4fd2cd8151a4e39898bf7", "84389f666719a457ef1a9e6a8cee6b9e327004d6" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Tue Mar 09 00:20:09 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Mar 09 00:20:09 2021 +0000" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/python/cpython2 am: 84389f6667\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1622524\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I3119fdded4a6782f9b704bf9923f449b889b3ff0\n" }, { "commit": "84389f666719a457ef1a9e6a8cee6b9e327004d6", "tree": "a585dec70bf1ab6a9316cd1b27fa8404c605af34", "parents": [ "4ecd19dd5860ec1a85b4fd2cd8151a4e39898bf7" ], "author": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Mon Mar 08 11:43:30 2021 -0800" }, "committer": { "name": "Bob Badour", "email": "bbadour@google.com", "time": "Mon Mar 08 11:43:30 2021 -0800" }, "message": "[LSC] Add LOCAL_LICENSE_KINDS to external/python/cpython2\n\nAdded SPDX-license-identifier-0BSD SPDX-license-identifier-Apache-2.0\n SPDX-license-identifier-BSD SPDX-license-identifier-CC0-1.0\n SPDX-license-identifier-GPL SPDX-license-identifier-GPL-2.0\n SPDX-license-identifier-GPL-3.0 SPDX-license-identifier-LGPL-2.1\n SPDX-license-identifier-MIT SPDX-license-identifier-MPL\n SPDX-license-identifier-PSF-2.0 SPDX-license-identifier-Zlib\n legacy_by_exception_only legacy_notice legacy_unencumbered\nto:\n Android.bp\n\nAdded SPDX-license-identifier-Apache-2.0 SPDX-license-identifier-BSD\n SPDX-license-identifier-GPL SPDX-license-identifier-MIT\n SPDX-license-identifier-PSF-2.0 SPDX-license-identifier-Zlib\n legacy_by_exception_only legacy_notice legacy_unencumbered\nto:\n Lib/Android.bp\n\nBug: 68860345\nBug: 151177513\nBug: 151953481\n\nTest: m all\n\nExempt-From-Owner-Approval: janitorial work\nChange-Id: Ib9a78084c97317eb0dbe19af9df3fba919205c3b\n" }, { "commit": "7d90f21ae24f94683edfb370225e903e1f03f3ff", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "3b19a89c85552d0985c3acce312d7516c7af7738", "411c271dbcd44a885231f0c2fd20fb1788eae4dd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 15:52:45 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 20 15:52:45 2021 +0000" }, "message": "[automerger skipped] Mark ab/7061308 as merged in stage. am: 4ecd19dd58 -s ours am: 1c865c3b9e -s ours am: 411c271dbc -s ours\n\nam skip reason: Change-Id I73a0e2cfcffe2ba65ff6ab6e475fea6210144e82 with SHA-1 f080cbbb54 is in history\n\nOriginal change: undetermined\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I6710c19059beec808202e4f83e51349ca1891508\n" }, { "commit": "56c7998d159104573c91c68fa9c8edef7c46e7bf", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "3b19a89c85552d0985c3acce312d7516c7af7738", "411c271dbcd44a885231f0c2fd20fb1788eae4dd" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 15:47:54 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 20 15:47:54 2021 +0000" }, "message": "[automerger skipped] Mark ab/7061308 as merged in stage. am: 4ecd19dd58 -s ours am: 1c865c3b9e -s ours am: 411c271dbc -s ours\n\nam skip reason: Change-Id I73a0e2cfcffe2ba65ff6ab6e475fea6210144e82 with SHA-1 f080cbbb54 is in history\n\nOriginal change: undetermined\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I96c0d8759f90acd5183b8e3cb4b79c903e0bb2fd\n" }, { "commit": "411c271dbcd44a885231f0c2fd20fb1788eae4dd", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "3b19a89c85552d0985c3acce312d7516c7af7738", "1c865c3b9e1dd031c193b51faf60f54189b66bfc" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 15:14:02 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 20 15:14:02 2021 +0000" }, "message": "[automerger skipped] Mark ab/7061308 as merged in stage. am: 4ecd19dd58 -s ours am: 1c865c3b9e -s ours\n\nam skip reason: Change-Id I73a0e2cfcffe2ba65ff6ab6e475fea6210144e82 with SHA-1 f080cbbb54 is in history\n\nOriginal change: undetermined\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: I62f5bf5a1ff5597048775878cdc3086fb9e9e1a2\n" }, { "commit": "1c865c3b9e1dd031c193b51faf60f54189b66bfc", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "f080cbbb54b1f4e5aacac57dcb83ff2a59561d37", "4ecd19dd5860ec1a85b4fd2cd8151a4e39898bf7" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 14:12:11 2021 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Sat Feb 20 14:12:11 2021 +0000" }, "message": "[automerger skipped] Mark ab/7061308 as merged in stage. am: 4ecd19dd58 -s ours\n\nam skip reason: Change-Id I73a0e2cfcffe2ba65ff6ab6e475fea6210144e82 with SHA-1 f080cbbb54 is in history\n\nOriginal change: undetermined\n\nMUST ONLY BE SUBMITTED BY AUTOMERGER\n\nChange-Id: Ifc775eaafaa0e469cd1c883d2f9493a1b139038c\n" }, { "commit": "4ecd19dd5860ec1a85b4fd2cd8151a4e39898bf7", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "ebadebeec5415918b68cc6a6569df23c51f63bd7", "f080cbbb54b1f4e5aacac57dcb83ff2a59561d37" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 00:24:16 2021 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Sat Feb 20 00:24:16 2021 -0800" }, "message": "Mark ab/7061308 as merged in stage.\n\nBug: 180401296\nMerged-In: I73a0e2cfcffe2ba65ff6ab6e475fea6210144e82\nChange-Id: I4b6a65d857b9308364f7615af8c71be6e2e6d6a8\n" }, { "commit": "3b19a89c85552d0985c3acce312d7516c7af7738", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "e2f627e8bc82d6cab5dcca5a11cc171bc63b13dc", "f080cbbb54b1f4e5aacac57dcb83ff2a59561d37" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Nov 24 02:34:19 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 24 02:34:19 2020 +0000" }, "message": "Mark ab/6881855 as merged am: ebadebeec5 am: f080cbbb54\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/python/cpython2/+/13109963\n\nChange-Id: If989faf702c633a4c728e449bfd47fc3c37fcd69\n" }, { "commit": "f080cbbb54b1f4e5aacac57dcb83ff2a59561d37", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "1af853fc97a40c74e0500af4d3f76ec598da7c25", "ebadebeec5415918b68cc6a6569df23c51f63bd7" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Tue Nov 24 02:03:14 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Nov 24 02:03:14 2020 +0000" }, "message": "Mark ab/6881855 as merged am: ebadebeec5\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/python/cpython2/+/13109963\n\nChange-Id: I73a0e2cfcffe2ba65ff6ab6e475fea6210144e82\n" }, { "commit": "ebadebeec5415918b68cc6a6569df23c51f63bd7", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "8273a56a6dfc1ba85eade958ebab26a25d2c2bbb", "005ef17c239a4d41563ef8874f2c64c1010ebc7a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Nov 23 11:30:27 2020 -0800" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Mon Nov 23 11:30:27 2020 -0800" }, "message": "Mark ab/6881855 as merged\n\nBug: 172690556\nChange-Id: Ifde318c142c5cdfcb116079229543bb16cefeb10\n" }, { "commit": "e2f627e8bc82d6cab5dcca5a11cc171bc63b13dc", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "57c72cfb797756a2c5c033db10afcefbc96da7fb", "1af853fc97a40c74e0500af4d3f76ec598da7c25" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 09 06:10:02 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 09 06:10:02 2020 +0000" }, "message": "[automerger skipped] Skip ab/6749736 in stage. am: 8273a56a6d -s ours am: 9c52ed6e0a -s ours am: 1af853fc97 -s ours\n\nam skip reason: Change-Id I1e0eff19b3ff3c1525914b569947413b05073528 with SHA-1 369499f7b9 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/python/cpython2/+/12797375\n\nChange-Id: Ieded72627b634c082683c1735cd55f64f01dbc60\n" }, { "commit": "1af853fc97a40c74e0500af4d3f76ec598da7c25", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "005ef17c239a4d41563ef8874f2c64c1010ebc7a", "9c52ed6e0af3ac766ca2d0fd0ff537062a0b1036" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 09 04:54:31 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 09 04:54:31 2020 +0000" }, "message": "[automerger skipped] Skip ab/6749736 in stage. am: 8273a56a6d -s ours am: 9c52ed6e0a -s ours\n\nam skip reason: Change-Id I1e0eff19b3ff3c1525914b569947413b05073528 with SHA-1 369499f7b9 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/python/cpython2/+/12797375\n\nChange-Id: I663ff4571790059ff36bc404c605039ef3563603\n" }, { "commit": "9c52ed6e0af3ac766ca2d0fd0ff537062a0b1036", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "2e2c6f2c871da45d6ad5fbab499c630e94c543dc", "8273a56a6dfc1ba85eade958ebab26a25d2c2bbb" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Fri Oct 09 04:23:56 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Oct 09 04:23:56 2020 +0000" }, "message": "[automerger skipped] Skip ab/6749736 in stage. am: 8273a56a6d -s ours\n\nam skip reason: Change-Id I1e0eff19b3ff3c1525914b569947413b05073528 with SHA-1 369499f7b9 is in history\n\nOriginal change: https://googleplex-android-review.googlesource.com/c/platform/external/python/cpython2/+/12797375\n\nChange-Id: I355bcfa9398d547de7cc5189de11786e13a79a3d\n" }, { "commit": "8273a56a6dfc1ba85eade958ebab26a25d2c2bbb", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "a6124811eefd0e68fd30cf0279351b92f6952f68", "369499f7b9b3525998927500602233e8825aa34a" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 08 17:21:24 2020 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Thu Oct 08 17:21:24 2020 -0700" }, "message": "Skip ab/6749736 in stage.\n\nMerged-In: I1e0eff19b3ff3c1525914b569947413b05073528\nChange-Id: I3b2a547ebefbff373e986ed331c685e020706101\n" }, { "commit": "57c72cfb797756a2c5c033db10afcefbc96da7fb", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "f7b7114e1599f9ff8d392047e0237550b5ac3680", "005ef17c239a4d41563ef8874f2c64c1010ebc7a" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Tue Sep 22 19:23:39 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 22 19:23:39 2020 +0000" }, "message": "Merge \"Add -Wno-strict-prototypes to suppress new warnings.\" am: 30b69e13b4 am: a6124811ee am: 45e205b144 am: 2e2c6f2c87 am: 005ef17c23\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1403104\n\nChange-Id: If9baaebb0867a9aad62f946be2cb9368a0e1117b\n" }, { "commit": "005ef17c239a4d41563ef8874f2c64c1010ebc7a", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "2ccb07a93429242e61792eb6855c77926a0b6d02", "2e2c6f2c871da45d6ad5fbab499c630e94c543dc" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Tue Sep 22 19:04:07 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 22 19:04:07 2020 +0000" }, "message": "Merge \"Add -Wno-strict-prototypes to suppress new warnings.\" am: 30b69e13b4 am: a6124811ee am: 45e205b144 am: 2e2c6f2c87\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1403104\n\nChange-Id: I0f5a120d35e5aa536822ac7d1e61d8cd778148a1\n" }, { "commit": "2e2c6f2c871da45d6ad5fbab499c630e94c543dc", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "369499f7b9b3525998927500602233e8825aa34a", "45e205b144bbb6576321d2611c68d5b88b0b936b" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Tue Sep 22 18:06:59 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 22 18:06:59 2020 +0000" }, "message": "Merge \"Add -Wno-strict-prototypes to suppress new warnings.\" am: 30b69e13b4 am: a6124811ee am: 45e205b144\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1403104\n\nChange-Id: I3c5dbc2fccfad6390212c1db74345083ce83c3b4\n" }, { "commit": "45e205b144bbb6576321d2611c68d5b88b0b936b", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "a6ecdfa003eb5bf56aee1d65424980ba1f5b72ca", "a6124811eefd0e68fd30cf0279351b92f6952f68" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Tue Sep 22 17:43:39 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 22 17:43:39 2020 +0000" }, "message": "Merge \"Add -Wno-strict-prototypes to suppress new warnings.\" am: 30b69e13b4 am: a6124811ee\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1403104\n\nChange-Id: Ie20f812857a32c00148817d9d57c60235924c657\n" }, { "commit": "a6124811eefd0e68fd30cf0279351b92f6952f68", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "a6ecdfa003eb5bf56aee1d65424980ba1f5b72ca", "30b69e13b4c8f6273523290bf1724784bab8ed55" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Tue Sep 22 17:27:54 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Sep 22 17:27:54 2020 +0000" }, "message": "Merge \"Add -Wno-strict-prototypes to suppress new warnings.\" am: 30b69e13b4\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1403104\n\nChange-Id: Id70ecba65b329795481494429d5724341ee7644e\n" }, { "commit": "30b69e13b4c8f6273523290bf1724784bab8ed55", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "a6ecdfa003eb5bf56aee1d65424980ba1f5b72ca", "cec0239c09eedf5ac7c5135b8bb4764f46773fb1" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Tue Sep 22 16:39:54 2020 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Sep 22 16:39:54 2020 +0000" }, "message": "Merge \"Add -Wno-strict-prototypes to suppress new warnings.\"" }, { "commit": "cec0239c09eedf5ac7c5135b8bb4764f46773fb1", "tree": "79bdb638086bd5e62a93349676dbb91ca5f68745", "parents": [ "6a4b58d73dbe1ac4749a5084b4fca8adb03d3294" ], "author": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Wed Jul 15 17:42:06 2020 -0700" }, "committer": { "name": "Stephen Hines", "email": "srhines@google.com", "time": "Tue Aug 04 10:17:13 2020 -0700" }, "message": "Add -Wno-strict-prototypes to suppress new warnings.\n\nBug: http://b/155835175\nTest: m with aosp_blueline\nChange-Id: I9625fa0ae8b463cf604bd392d2c6e39559997be9\n" }, { "commit": "f7b7114e1599f9ff8d392047e0237550b5ac3680", "tree": "eb6e572cd3ddb3dbcd4674d5b7246fb1494a478f", "parents": [ "1b33d648273957a8c8129d156219a8e40389cbec", "2ccb07a93429242e61792eb6855c77926a0b6d02" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Fri Jul 17 23:26:37 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 17 23:26:37 2020 +0000" }, "message": "Fix build for macOS 11 SDK am: 6a4b58d73d am: 8c5e412865 am: a6ecdfa003 am: 369499f7b9 am: 2ccb07a934\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1362702\n\nChange-Id: Idcdac9a57820173c481b108a8e73b8870b4d2472\n" }, { "commit": "2ccb07a93429242e61792eb6855c77926a0b6d02", "tree": "eb6e572cd3ddb3dbcd4674d5b7246fb1494a478f", "parents": [ "e3cbb246aaa5b193ae91aff3bb785680eb7fa6b2", "369499f7b9b3525998927500602233e8825aa34a" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Fri Jul 17 22:58:05 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 17 22:58:05 2020 +0000" }, "message": "Fix build for macOS 11 SDK am: 6a4b58d73d am: 8c5e412865 am: a6ecdfa003 am: 369499f7b9\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1362702\n\nChange-Id: Ic452ba0d7ced553f29be56b4aa146c409a675c20\n" }, { "commit": "369499f7b9b3525998927500602233e8825aa34a", "tree": "eb6e572cd3ddb3dbcd4674d5b7246fb1494a478f", "parents": [ "46cbade067cf56f9b2b852d083883e1b0a4488bd", "a6ecdfa003eb5bf56aee1d65424980ba1f5b72ca" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Fri Jul 17 22:39:25 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 17 22:39:25 2020 +0000" }, "message": "Fix build for macOS 11 SDK am: 6a4b58d73d am: 8c5e412865 am: a6ecdfa003\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1362702\n\nChange-Id: I1e0eff19b3ff3c1525914b569947413b05073528\n" }, { "commit": "a6ecdfa003eb5bf56aee1d65424980ba1f5b72ca", "tree": "eb6e572cd3ddb3dbcd4674d5b7246fb1494a478f", "parents": [ "fe28067d05db35e64bfd52aec3bd454dd1811d4c", "8c5e4128659acea48e3430eadac7e2debb8c6503" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Fri Jul 17 22:12:35 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 17 22:12:35 2020 +0000" }, "message": "Fix build for macOS 11 SDK am: 6a4b58d73d am: 8c5e412865\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1362702\n\nChange-Id: I3496f791b9e7cfe5b16e2daac5d1214637ee4ccb\n" }, { "commit": "8c5e4128659acea48e3430eadac7e2debb8c6503", "tree": "eb6e572cd3ddb3dbcd4674d5b7246fb1494a478f", "parents": [ "f15d0f01f0db905e60300cb9d4556bf5e3a5bff2", "6a4b58d73dbe1ac4749a5084b4fca8adb03d3294" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Fri Jul 17 21:46:30 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jul 17 21:46:30 2020 +0000" }, "message": "Fix build for macOS 11 SDK am: 6a4b58d73d\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/python/cpython2/+/1362702\n\nChange-Id: I8719cdceaa109c5be9b49666c7506ae2cd9d366b\n" }, { "commit": "6a4b58d73dbe1ac4749a5084b4fca8adb03d3294", "tree": "eb6e572cd3ddb3dbcd4674d5b7246fb1494a478f", "parents": [ "f15d0f01f0db905e60300cb9d4556bf5e3a5bff2" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Tue Jul 14 16:46:20 2020 -0700" }, "committer": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Tue Jul 14 16:46:20 2020 -0700" }, "message": "Fix build for macOS 11 SDK\n\nThis file uses MAC_OS_X_VERSION_*, which are defined in\nAvailabilityMacros.h\n\nTest: build with macOS 11 SDK\nChange-Id: If60aeb0e2eb0891b448fbba5db5d03079d826967\n" }, { "commit": "1b33d648273957a8c8129d156219a8e40389cbec", "tree": "56e22b1455adbb2f178c5e21e0ce19a44ef5ec30", "parents": [ "4ecd9450778988240cdfa9b2721750a433cec969", "e3cbb246aaa5b193ae91aff3bb785680eb7fa6b2" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Thu Apr 30 23:55:59 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Apr 30 23:55:59 2020 +0000" }, "message": "Add METADATA file am: e333fc1aee am: f15d0f01f0 am: fe28067d05 am: 46cbade067 am: e3cbb246aa\n\nChange-Id: I2890088b29446b4329ff03ce5592e9aa8a581206\n" }, { "commit": "e3cbb246aaa5b193ae91aff3bb785680eb7fa6b2", "tree": "56e22b1455adbb2f178c5e21e0ce19a44ef5ec30", "parents": [ "4ecd9450778988240cdfa9b2721750a433cec969", "46cbade067cf56f9b2b852d083883e1b0a4488bd" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Thu Apr 30 23:39:31 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Apr 30 23:39:31 2020 +0000" }, "message": "Add METADATA file am: e333fc1aee am: f15d0f01f0 am: fe28067d05 am: 46cbade067\n\nChange-Id: I05205cdeb16b47886c140146d5f34737cf685801\n" }, { "commit": "46cbade067cf56f9b2b852d083883e1b0a4488bd", "tree": "56e22b1455adbb2f178c5e21e0ce19a44ef5ec30", "parents": [ "4ecd9450778988240cdfa9b2721750a433cec969", "fe28067d05db35e64bfd52aec3bd454dd1811d4c" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Thu Apr 30 23:24:22 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Apr 30 23:24:22 2020 +0000" }, "message": "Add METADATA file am: e333fc1aee am: f15d0f01f0 am: fe28067d05\n\nChange-Id: I9ab30d0e5893b08da10d79b99b43d55b5cf5c5ae\n" }, { "commit": "fe28067d05db35e64bfd52aec3bd454dd1811d4c", "tree": "56e22b1455adbb2f178c5e21e0ce19a44ef5ec30", "parents": [ "4ecd9450778988240cdfa9b2721750a433cec969", "f15d0f01f0db905e60300cb9d4556bf5e3a5bff2" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Thu Apr 30 23:03:59 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Apr 30 23:03:59 2020 +0000" }, "message": "Add METADATA file am: e333fc1aee am: f15d0f01f0\n\nChange-Id: I9b3bd64c8243fd4172c39bc0cce4b2b002977516\n" }, { "commit": "f15d0f01f0db905e60300cb9d4556bf5e3a5bff2", "tree": "56e22b1455adbb2f178c5e21e0ce19a44ef5ec30", "parents": [ "edba983036eab94d6c8eb211198f5ae5a874b7b0", "e333fc1aee813e62c7e618784f33ef836cd5b00d" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Thu Apr 30 22:43:58 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Apr 30 22:43:58 2020 +0000" }, "message": "Add METADATA file am: e333fc1aee\n\nChange-Id: If2710e0c7c5455370162988aaa7a36eb8a5db4df\n" }, { "commit": "e333fc1aee813e62c7e618784f33ef836cd5b00d", "tree": "56e22b1455adbb2f178c5e21e0ce19a44ef5ec30", "parents": [ "edba983036eab94d6c8eb211198f5ae5a874b7b0" ], "author": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Thu Apr 30 14:12:26 2020 -0700" }, "committer": { "name": "Dan Willemsen", "email": "dwillemsen@google.com", "time": "Thu Apr 30 14:12:36 2020 -0700" }, "message": "Add METADATA file\n\nTest: none\nChange-Id: Ic527cccf632b4e76d367581482439a4828beaaa3\n" }, { "commit": "4ecd9450778988240cdfa9b2721750a433cec969", "tree": "b9f44455347b052718d6676d398fa4c0512c6ac3", "parents": [ "fb734ea0e884efca41bedcf04d8d6836dc547872", "edba983036eab94d6c8eb211198f5ae5a874b7b0" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 10 22:25:40 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 10 22:25:40 2020 +0000" }, "message": "Add liblog as a dependency where libbase is used. am: 96459324c3 am: bd93891e7a am: edba983036\n\nChange-Id: Ie544d4794c1cd621dfd36f833f563bdbe3ec40f0\n" }, { "commit": "edba983036eab94d6c8eb211198f5ae5a874b7b0", "tree": "b9f44455347b052718d6676d398fa4c0512c6ac3", "parents": [ "50feb72fbdf40e983cc33e325eec7acf7aa72286", "bd93891e7a4d08bfcab0d74ef278b94b29103580" ], "author": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 10 22:13:03 2020 +0000" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 10 22:13:03 2020 +0000" }, "message": "Add liblog as a dependency where libbase is used. am: 96459324c3 am: bd93891e7a\n\nChange-Id: I6354bae9d15132fbf0303e824faa8ff685c4d4a1\n" }, { "commit": "bd93891e7a4d08bfcab0d74ef278b94b29103580", "tree": "b9f44455347b052718d6676d398fa4c0512c6ac3", "parents": [ "8c8f0bb4662076c4acab2123bd8de180f9f8ecaf", "96459324c3f633af4b35c29a16ac25aeb7894a7d" ], "author": { "name": "Tom Cherry", "email": "tomcherry@google.com", "time": "Fri Jan 10 14:02:46 2020 -0800" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Fri Jan 10 14:02:46 2020 -0800" }, "message": "Add liblog as a dependency where libbase is used.\nam: 96459324c3\n\nChange-Id: I4908b0beefacae95de8a3cf9632e97be63308ed8\n" }, { "commit": "96459324c3f633af4b35c29a16ac25aeb7894a7d", "tree": "b9f44455347b052718d6676d398fa4c0512c6ac3", "parents": [ "8c8f0bb4662076c4acab2123bd8de180f9f8ecaf" ], "author": { "name": "Tom Cherry", "email": "tomcherry@google.com", "time": "Wed Jan 08 14:11:54 2020 -0800" }, "committer": { "name": "Tom Cherry", "email": "tomcherry@google.com", "time": "Wed Jan 08 14:11:54 2020 -0800" }, "message": "Add liblog as a dependency where libbase is used.\n\nBug: 119867234\nTest: build\nChange-Id: Iba470166a6c4072243d0c6232d0ad597ac3ff6f7\n" }, { "commit": "fb734ea0e884efca41bedcf04d8d6836dc547872", "tree": "f79f5aceda736187485f696a95209ad5eb108580", "parents": [ "a6e64234d41c6b1f2c2ed1a0ec1205b7b2f66025", "50feb72fbdf40e983cc33e325eec7acf7aa72286" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 14:23:16 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 30 14:23:16 2019 -0700" }, "message": "[automerger skipped] DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master am: 8c8f0bb466\nam: 50feb72fbd -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: I56aa0aec08faab903adc1e7fc4267a7ed6be201a\n" }, { "commit": "50feb72fbdf40e983cc33e325eec7acf7aa72286", "tree": "f79f5aceda736187485f696a95209ad5eb108580", "parents": [ "84316ecfcd5cdb57d0e41fbe04f9a747f155e24c", "8c8f0bb4662076c4acab2123bd8de180f9f8ecaf" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 13:59:31 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Wed Oct 30 13:59:31 2019 -0700" }, "message": "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master\nam: 8c8f0bb466\n\nChange-Id: Iad8f8de289c22e301938dfd61c9479996a224286\n" }, { "commit": "8c8f0bb4662076c4acab2123bd8de180f9f8ecaf", "tree": "f79f5aceda736187485f696a95209ad5eb108580", "parents": [ "1c13c899cb54e69f9c795640f981becc7a507298", "84316ecfcd5cdb57d0e41fbe04f9a747f155e24c" ], "author": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 11:48:22 2019 -0700" }, "committer": { "name": "Xin Li", "email": "delphij@google.com", "time": "Wed Oct 30 11:48:22 2019 -0700" }, "message": "DO NOT MERGE - qt-qpr1-dev-plus-aosp-without-vendor@5915889 into stage-aosp-master\n\nBug: 142003500\nChange-Id: I22eab2dc2620276abbee654fe6886481c3a4fd59\n" }, { "commit": "a6e64234d41c6b1f2c2ed1a0ec1205b7b2f66025", "tree": "f79f5aceda736187485f696a95209ad5eb108580", "parents": [ "2dda75903bfcf23f334e1c86ab1bd8e54cf83d9d", "84316ecfcd5cdb57d0e41fbe04f9a747f155e24c" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Sep 26 12:29:35 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 26 12:29:35 2019 -0700" }, "message": "Merge \"Disable leak detection locally.\" am: b968753ab5 am: 1c13c899cb am: 33c71b00e2\nam: 84316ecfcd\n\nChange-Id: Idae7467210b0ab485377ce62a273fdb91b12bc9f\n" }, { "commit": "84316ecfcd5cdb57d0e41fbe04f9a747f155e24c", "tree": "f79f5aceda736187485f696a95209ad5eb108580", "parents": [ "5ec2c973de9dde6598b2551d52009ee4af7fbb36", "33c71b00e25c9cefdef7241cb2566f682c060894" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Sep 26 12:19:07 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 26 12:19:07 2019 -0700" }, "message": "Merge \"Disable leak detection locally.\" am: b968753ab5 am: 1c13c899cb\nam: 33c71b00e2\n\nChange-Id: If27ce3aa849edc5d36dbd3cc2c03d802639b8183\n" }, { "commit": "33c71b00e25c9cefdef7241cb2566f682c060894", "tree": "f79f5aceda736187485f696a95209ad5eb108580", "parents": [ "a32b543c7ab0b18641ff91a1645c57a891c8e9d4", "1c13c899cb54e69f9c795640f981becc7a507298" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Sep 26 12:06:20 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 26 12:06:20 2019 -0700" }, "message": "Merge \"Disable leak detection locally.\" am: b968753ab5\nam: 1c13c899cb\n\nChange-Id: I2ef23de47f401165b7246bdd3de3797e60d47392\n" }, { "commit": "1c13c899cb54e69f9c795640f981becc7a507298", "tree": "f79f5aceda736187485f696a95209ad5eb108580", "parents": [ "46667d89e29dcafdd69e8a1a32566bc06c9ab494", "b968753ab50b207f8ba26f7678ef57f303cf0ea2" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Sep 26 11:55:41 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 26 11:55:41 2019 -0700" }, "message": "Merge \"Disable leak detection locally.\"\nam: b968753ab5\n\nChange-Id: Ia305c3d30a89453ac839109cdfa777bf3e97115e\n" }, { "commit": "b968753ab50b207f8ba26f7678ef57f303cf0ea2", "tree": "f79f5aceda736187485f696a95209ad5eb108580", "parents": [ "f67325ce45c763c0c13cdd50d5dbc62803f850ed", "71ec940f78ca83f5a35fdcbbcde26c0947cc10c4" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Thu Sep 26 18:48:54 2019 +0000" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Thu Sep 26 18:48:54 2019 +0000" }, "message": "Merge \"Disable leak detection locally.\"" }, { "commit": "2dda75903bfcf23f334e1c86ab1bd8e54cf83d9d", "tree": "5adc33be591b247e557469fa3a6ca37b084a2424", "parents": [ "fa37090dcba250d84c5aa7541ad37a598eecdc97", "5ec2c973de9dde6598b2551d52009ee4af7fbb36" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Sep 26 08:20:18 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 26 08:20:18 2019 -0700" }, "message": "Use libcrypto_static instead of libcrypto am: f67325ce45 am: 46667d89e2 am: a32b543c7a\nam: 5ec2c973de\n\nChange-Id: Ie5ea0a06c19803c7d60171c1df3e73c9bfdc3f09\n" }, { "commit": "5ec2c973de9dde6598b2551d52009ee4af7fbb36", "tree": "5adc33be591b247e557469fa3a6ca37b084a2424", "parents": [ "fa37090dcba250d84c5aa7541ad37a598eecdc97", "a32b543c7ab0b18641ff91a1645c57a891c8e9d4" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Sep 26 08:07:28 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 26 08:07:28 2019 -0700" }, "message": "Use libcrypto_static instead of libcrypto am: f67325ce45 am: 46667d89e2\nam: a32b543c7a\n\nChange-Id: If9abc47ee66f66fb23c65357544af5cf49f4998b\n" }, { "commit": "a32b543c7ab0b18641ff91a1645c57a891c8e9d4", "tree": "5adc33be591b247e557469fa3a6ca37b084a2424", "parents": [ "fa37090dcba250d84c5aa7541ad37a598eecdc97", "46667d89e29dcafdd69e8a1a32566bc06c9ab494" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Sep 26 07:54:20 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 26 07:54:20 2019 -0700" }, "message": "Use libcrypto_static instead of libcrypto am: f67325ce45\nam: 46667d89e2\n\nChange-Id: Ie60f2c43c379f90b75052521cb2cd287c77955e8\n" }, { "commit": "46667d89e29dcafdd69e8a1a32566bc06c9ab494", "tree": "5adc33be591b247e557469fa3a6ca37b084a2424", "parents": [ "fa37090dcba250d84c5aa7541ad37a598eecdc97", "f67325ce45c763c0c13cdd50d5dbc62803f850ed" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Thu Sep 26 07:41:57 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Thu Sep 26 07:41:57 2019 -0700" }, "message": "Use libcrypto_static instead of libcrypto\nam: f67325ce45\n\nChange-Id: Ibdbb9fbaf69915fe1d25641a3f4e744740b6acff\n" }, { "commit": "71ec940f78ca83f5a35fdcbbcde26c0947cc10c4", "tree": "3d0fe4b8a9d5c50a227e8f08df8ce9a4a39ac894", "parents": [ "fa37090dcba250d84c5aa7541ad37a598eecdc97" ], "author": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Tue Sep 24 18:43:59 2019 -0700" }, "committer": { "name": "Steven Moreland", "email": "smoreland@google.com", "time": "Tue Sep 24 18:43:59 2019 -0700" }, "message": "Disable leak detection locally.\n\nSince it was disabled globally before.\n\nBug: 141583221\nTest: build host w/ ASAN\nChange-Id: I29844e7bf7df0031062736b2c18ba2e028ffc6ab\n" }, { "commit": "f67325ce45c763c0c13cdd50d5dbc62803f850ed", "tree": "5adc33be591b247e557469fa3a6ca37b084a2424", "parents": [ "fa37090dcba250d84c5aa7541ad37a598eecdc97" ], "author": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Sep 18 11:05:54 2019 -0700" }, "committer": { "name": "Colin Cross", "email": "ccross@android.com", "time": "Wed Sep 18 11:05:54 2019 -0700" }, "message": "Use libcrypto_static instead of libcrypto\n\nReplace libcrypto with libcrypto_static, which can be protected through\nvisibility to ensure only modules that don\u0027t affect FIPS certification\ncan use it.\n\nBug: 141248879\nTest: m checkbuild\nChange-Id: I991e805f555cbebeb96e253910ab155b7fd22a0c\n" }, { "commit": "fa37090dcba250d84c5aa7541ad37a598eecdc97", "tree": "36d2f9f04ddb1cbdbb5f04e71d34c3d14b3598ee", "parents": [ "b218aacb7678b8bec6a69ad9858c2300f5c2e613", "9f9c3465d6f06f3d0bbeace79b47aa2790239f62" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Mar 11 14:34:23 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Mar 11 14:34:23 2019 -0700" }, "message": "[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into master am: de0c76cc04 -s ours am: f8562989fc -s ours\nam: 9f9c3465d6 -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: I9c3a9dea03d883b6b5a21a2557896aa0fc96265c\n" }, { "commit": "9f9c3465d6f06f3d0bbeace79b47aa2790239f62", "tree": "36d2f9f04ddb1cbdbb5f04e71d34c3d14b3598ee", "parents": [ "f25f22e1b09fd9f13b77cef56277e8bb0a34d672", "f8562989fcefeed7b7d7e1c805b42ce32defbb2a" ], "author": { "name": "The Android Open Source Project", "email": "initial-contribution@android.com", "time": "Mon Mar 11 14:05:01 2019 -0700" }, "committer": { "name": "android-build-merger", "email": "android-build-merger@google.com", "time": "Mon Mar 11 14:05:01 2019 -0700" }, "message": "[automerger skipped] DO NOT MERGE - Skip PPRL.190305.001 into master am: de0c76cc04 -s ours\nam: f8562989fc -s ours\nam skip reason: subject contains skip directive\n\nChange-Id: Icf2a60f331773252d9a4f03ebf8fe245cf76e803\n" } ], "next": "f8562989fcefeed7b7d7e1c805b42ce32defbb2a" }