)]}' { "log": [ { "commit": "e4c4755100a76a9806476f15c94b88de7859490c", "tree": "a0200ec153ff38b1f47387bad84cc2a0e8ca792f", "parents": [ "994e4b77aa1aeac8ddc686a224180fc486cd7bce" ], "author": { "name": "Copybara", "email": "noreply@copybara.io", "time": "Wed Mar 19 06:08:18 2025 +0000" }, "committer": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Tue Mar 25 16:39:24 2025 +0000" }, "message": "Import 18th Mar 2025 ToT Cronet from Chromium to AOSP\n\nGenerated by Copybara via Chromium\u0027s ci/android-cronet-arm64-gn2bp-dbg:\nhttps://ci.chromium.org/ui/p/chromium/builders/ci/android-cronet-arm64-gn2bp-dbg/7609/overview.\nThen updated to include a cherry-pick of\nhttps://chromium-review.googlesource.com/c/chromium/src/+/6383356.\n\nThese can also be seen from the branch representing this import:\nhttps://chromium.googlesource.com/experimental/chromium/src/+/refs/wip/cronet/aosp-tot_import_mar_18_25.\nWith commit SHA: 3e3cc0341bdf13d1c6593a9f206eaf7f13c463e1.\n\nThis commit can be reproduced by running:\n$ gclient config --spec \u0027solutions \u003d [\n {\n \"name\": \"src\",\n \"url\":\n\"https://chromium.googlesource.com/experimental/chromium/src.git\",\n \"managed\": False,\n \"custom_deps\": {},\n \"custom_vars\": {\n \"checkout_copybara\": True,\n },\n },\n]\ntarget_os \u003d [\"android\"]\n\u0027 \u0026\u0026\ngclient sync --rev\u003drefs/wip/cronet/aosp-tot_import_mar_18_25 --shallow \u0026\u0026\ncd src \u0026\u0026\nvpython3 components/cronet/gn2bp/run_gn2bp.py\n\nAdditionally, manual tweaks have been applied after patchset 1. These\nare required to:\n1. Fix naming in non-versioned/templated top-level Android.bp\n2. Resolve merge conflicts\n3. Update consistency files with changes (1) and (2)\n\nBug: b:403544010\nFolderOrigin-RevId: /b/s/w/ir/cache/builder/src\nChange-Id: I15308a1c82a99a6d850bfb0ed37dbbf91439b9ea\n" }, { "commit": "994e4b77aa1aeac8ddc686a224180fc486cd7bce", "tree": "8331af53b6af782927d3eb393a1c0b4e61ecef1f", "parents": [ "b2ea54ca0df7b5d3f4dbc1de43144557037ac847", "8e2b8e67a1ab6be148d1b2a4cbb23b33d3ac6b24" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Mar 14 07:12:11 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Mar 14 07:12:11 2025 -0700" }, "message": "Merge \"Fix kotlin formatter\" into main" }, { "commit": "b2ea54ca0df7b5d3f4dbc1de43144557037ac847", "tree": "6e0fc58093838c4f844f266401802bcd312dbc8d", "parents": [ "24f3afdc8b1a2d33b635bdc8c7ba40f90cb72130", "643f9c1211b13198d784a8abd6d374a7a37a0c51" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Fri Mar 14 06:57:05 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Mar 14 06:57:05 2025 -0700" }, "message": "Merge changes from topic \"pony\" into main\n\n* changes:\n Delete Cronet top-level import\n Delete Cronet top-level import\n Delete Cronet top-level import\n Delete Cronet top-level import\n Delete Cronet top-level import\n Delete Cronet top-level import\n Delete Cronet top-level import\n Delete Cronet top-level import\n Delete Cronet top-level import\n [133.0.6876.3 v2] Introduce tests that always target Cronet Stable\n [133.0.6876.3 v2] Indirection layer for ToT and Stable\n [133.0.6876.3 v2] Regenerate consistency file for Stable\n [133.0.6876.3 v2] Regenerate consistency file for ToT\n [133.0.6876.3 v2] Add ToT/Stable build files\n [133.0.6876.3 v2] Apply cherry-picks\n Introduce Cronet ToT import channel\n Introduce Cronet ToT import channel\n Introduce Cronet ToT import channel\n Introduce Cronet ToT import channel\n Introduce Cronet ToT import channel\n Introduce Cronet ToT import channel\n Introduce Cronet ToT import channel\n Introduce Cronet ToT import channel\n Introduce Cronet ToT import channel\n Introduce Cronet ToT import channel\n Introduce Cronet Stable import channel\n Introduce Cronet Stable import channel\n Introduce Cronet Stable import channel\n Introduce Cronet Stable import channel\n Introduce Cronet Stable import channel\n Introduce Cronet Stable import channel\n Introduce Cronet Stable import channel\n Introduce Cronet Stable import channel\n Introduce Cronet Stable import channel\n Introduce Cronet Stable import channel\n" }, { "commit": "643f9c1211b13198d784a8abd6d374a7a37a0c51", "tree": "20e160dc689857ded303b00816e9ffe128843d99", "parents": [ "e35d2816d736edc51206220785592d977203543d" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 15:39:28 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 16:02:21 2025 +0000" }, "message": "Delete Cronet top-level import\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts deleting the old top level directories. This is done in\nmultiple steps as gerrit canno handle an entire deletion of Cronet in\none go (too many files).\n\nDeleting: net/*\n\nBug: b:396593141\nChange-Id: Ib51ba9ec3a0a7327e2b01cd28870ab2d728d1e77\n" }, { "commit": "e35d2816d736edc51206220785592d977203543d", "tree": "d2d7b8dfac86ab56e781fa58471ac1b0a8cda063", "parents": [ "372ad46b608c783cbe8d7864809a3e32c1b07132" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 15:38:03 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 16:02:21 2025 +0000" }, "message": "Delete Cronet top-level import\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts deleting the old top level directories. This is done in\nmultiple steps as gerrit canno handle an entire deletion of Cronet in\none go (too many files).\n\nDeleting: crypto/*, ipc/*, testing/*, url/*\n\nBug: b:396593141\nChange-Id: I28576e83303239211cc473397b42afeef4d121d3\n" }, { "commit": "372ad46b608c783cbe8d7864809a3e32c1b07132", "tree": "427c1f7f87ec79c3d79dd0b98052d6ff2352c3d6", "parents": [ "cfab5f5f9c4fc61a3e519b0488964322e3a0593e" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 15:37:32 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 16:02:21 2025 +0000" }, "message": "Delete Cronet top-level import\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts deleting the old top level directories. This is done in\nmultiple steps as gerrit canno handle an entire deletion of Cronet in\none go (too many files).\n\nDeleting: chrome/* and components/*\n\nBug: b:396593141\nChange-Id: I8b85adca438a94c8f56b656575abe80662efc71d\n" }, { "commit": "cfab5f5f9c4fc61a3e519b0488964322e3a0593e", "tree": "d859da71f5da547b64e72a97c935a985ec646ded", "parents": [ "b0c1196653a730d4f2fda759f33c3df10255eed4" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 15:34:52 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 16:02:20 2025 +0000" }, "message": "Delete Cronet top-level import\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts deleting the old top level directories. This is done in\nmultiple steps as gerrit canno handle an entire deletion of Cronet in\none go (too many files).\n\nDeleting: build/* and buildtools/*\n\nBug: b:396593141\nChange-Id: Ief49604bdb02062c460f9efd2b83c532adfeee86\n" }, { "commit": "b0c1196653a730d4f2fda759f33c3df10255eed4", "tree": "c77d9135b41207b7af8639aee994d6d1ff5d56ca", "parents": [ "dbf759c9cd381464679f9039c0fed89450f4ffc6" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 15:15:32 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 16:02:20 2025 +0000" }, "message": "Delete Cronet top-level import\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts deleting the old top level directories. This is done in\nmultiple steps as gerrit canno handle an entire deletion of Cronet in\none go (too many files).\n\nDeleting: remaining things in third_party/*\n\nBug: b:396593141\nChange-Id: I6083dfe19099e41a6399aab2fce89bba818f0f43\n" }, { "commit": "dbf759c9cd381464679f9039c0fed89450f4ffc6", "tree": "e5a8069c9b4b26245fb8386ab882ae069a958f77", "parents": [ "d1717329caac3a857ab5063819b6f6ba03d43168" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 15:15:02 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 16:02:20 2025 +0000" }, "message": "Delete Cronet top-level import\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts deleting the old top level directories. This is done in\nmultiple steps as gerrit canno handle an entire deletion of Cronet in\none go (too many files).\n\nDeleting: third_party/protobuf/*\n\nBug: b:396593141\nChange-Id: I68fd180515b7877f96746bd1369b603fd913c55a\n" }, { "commit": "d1717329caac3a857ab5063819b6f6ba03d43168", "tree": "5a8825fe5e0244f7e9b35e3fee489dc102203b08", "parents": [ "83cd774e6848d531e525116012861cba77eecee4" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 15:14:38 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 16:02:19 2025 +0000" }, "message": "Delete Cronet top-level import\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts deleting the old top level directories. This is done in\nmultiple steps as gerrit canno handle an entire deletion of Cronet in\none go (too many files).\n\nDeleting: third_party/libc++/*\n\nBug: b:396593141\nChange-Id: I647b8afc43725a00cb66d2e82477caa87506b651\n" }, { "commit": "83cd774e6848d531e525116012861cba77eecee4", "tree": "8d997ac2f6b96d9042aa2eb5977b011f8aa4d585", "parents": [ "0dd382b3060ab7a78adcf05a1ee1e0e5387755fa" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 15:11:04 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 16:02:19 2025 +0000" }, "message": "Delete Cronet top-level import\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts deleting the old top level directories. This is done in\nmultiple steps as gerrit canno handle an entire deletion of Cronet in\none go (too many files).\n\nDeleting: third_party/boringssl/*\n\nBug: b:396593141\nChange-Id: I3da3dac3df94ce1e60782ac0fcd21b7452a336ec\n" }, { "commit": "0dd382b3060ab7a78adcf05a1ee1e0e5387755fa", "tree": "54f0d6093e4b75a281d435ec697adf3d3eeaa22f", "parents": [ "b8c94bf2e3cd11c53000d9638f33b04449805357" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 15:09:25 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 16:02:19 2025 +0000" }, "message": "Delete Cronet top-level import\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts deleting the old top level directories. This is done in\nmultiple steps as gerrit canno handle an entire deletion of Cronet in\none go (too many files).\n\nDeleting: base/*\n\nBug: b:396593141\nChange-Id: Ibe59215e3039a98b88fe3e77b50574ae2b6d1fff\n" }, { "commit": "b8c94bf2e3cd11c53000d9638f33b04449805357", "tree": "66e17d8ed1588e6393840bd7d64d219cd8d49a42", "parents": [ "aa1f4233477ae4c66950a41cc578ada4d59cd0a8" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Mar 11 16:56:06 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 16:02:18 2025 +0000" }, "message": "[133.0.6876.3 v2] Introduce tests that always target Cronet Stable\n\nTH runs only for the trunk_staging configuration. Now that trunk_staging\ntargets Cronet ToT, we\u0027re no longer running tests for Cronet Stable.\nIdeally, we would configure presubmits targeting the mainline\nconfiguration; unfortunately, that is not trivial (broccoli man). As a\ntemporary intermediate step, while we set up things properly, duplicate\nour test targets to make sure we also always run tests targeting Cronet\nStable.\n\nBug: b:396593141\nChange-Id: Ic916caa72be591371c054c162527908550304200\n" }, { "commit": "aa1f4233477ae4c66950a41cc578ada4d59cd0a8", "tree": "da8d1e520428d464a633f83cdf7cb257a3415116", "parents": [ "1cd21750956e8b16778a56f92500da2a2138ba50" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 15:40:22 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 16:02:18 2025 +0000" }, "message": "[133.0.6876.3 v2] Indirection layer for ToT and Stable\n\nCode outside of //external/cronet must not know about the existance of\nToT and Stable import channels, abstract them away with the use of build\nsystem flags.\n\nGenerally speaking, we can expect //external/cronet/Android.bp to\ncontain most of what //external/cronet/Android.extras.bp used to contain\nprior to the introducetion of ToT and Stable. It\u0027s still unclear whether\nwe should try to put as many things as possible into\n//external/cronet/Android.bp, as oppposed to\n//external/cronet/{tot, stable}/Android.extras.bp. For the time being,\nwe will move forward as is. Then, over time, we should converge on a\nsplit that minimizes maintenance.\n\nNote: since we\u0027re wiring all the targets used outside of\n//external/cronet, we can get rid of the old build files.\n\nBug: b:396593141\nChange-Id: I019011c7b9cefe2683b4b539de4ff33a6e4052b8\n" }, { "commit": "1cd21750956e8b16778a56f92500da2a2138ba50", "tree": "69b729885fa3fddb3224cf66f8f4e403ecfe77e6", "parents": [ "d950e4e48278ffa04e9ffd1562fd35fd7c5d3365" ], "author": { "name": "Cronet Mainline Eng", "email": "cronet-mainline-eng+copybara@google.com", "time": "Tue Feb 25 17:33:20 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 16:02:18 2025 +0000" }, "message": "[133.0.6876.3 v2] Regenerate consistency file for Stable\n\nThe code in this commit was generated from the branch representing this\nimport:\nhttps://chromium.googlesource.com/experimental/chromium/src/+/refs/wip/cronet/aosp-133.0.6876.3-v2.\nWith commit SHA: c431541ea3e4539b058ad2c4a117c4790d608b26.\n\nThis commit can be reproduced by running:\n$ gclient config --spec \u0027solutions \u003d [\n {\n \"name\": \"src\",\n \"url\": \"https://chromium.googlesource.com/experimental/chromium/src.git\",\n \"managed\": False,\n \"custom_deps\": {},\n \"custom_vars\": {\n \"checkout_copybara\": True,\n },\n },\n]\ntarget_os \u003d [\"android\"]\n\u0027 \u0026\u0026\ngclient sync --rev\u003drefs/wip/cronet/aosp-133.0.6876.3-v2 --shallow\n\nThen running the following commands:\n$ vpython3 components/cronet/gn2bp/run_gn2bp.py --channel\u003dstable --git-url-and-branch \"file:////${AOSP_REPO}/external/cronet \"${BRANCH}\" --regenerate-consistency-file\n\nBug: b:396593141\nChange-Id: I792fd7bc1d4263116cee3b855f09531ffb5bfaf7\n" }, { "commit": "d950e4e48278ffa04e9ffd1562fd35fd7c5d3365", "tree": "61687e77ca03254058cd6f78d97a3d1d95428938", "parents": [ "3c1fad332c14ed9eacac694e7c06b61200b4f76c" ], "author": { "name": "Cronet Mainline Eng", "email": "cronet-mainline-eng+copybara@google.com", "time": "Tue Feb 25 17:23:23 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 16:02:17 2025 +0000" }, "message": "[133.0.6876.3 v2] Regenerate consistency file for ToT\n\nThe code in this commit was generated from the branch representing this\nimport:\nhttps://chromium.googlesource.com/experimental/chromium/src/+/refs/wip/cronet/aosp-133.0.6876.3-v2.\nWith commit SHA: c431541ea3e4539b058ad2c4a117c4790d608b26.\n\nThis commit can be reproduced by running:\n$ gclient config --spec \u0027solutions \u003d [\n {\n \"name\": \"src\",\n \"url\": \"https://chromium.googlesource.com/experimental/chromium/src.git\",\n \"managed\": False,\n \"custom_deps\": {},\n \"custom_vars\": {\n \"checkout_copybara\": True,\n },\n },\n]\ntarget_os \u003d [\"android\"]\n\u0027 \u0026\u0026\ngclient sync --rev\u003drefs/wip/cronet/aosp-133.0.6876.3-v2 --shallow\n\nThen running the following commands:\n$ vpython3 components/cronet/gn2bp/run_gn2bp.py --channel\u003dtot --git-url-and-branch \"file:////${AOSP_REPO}/external/cronet \"${BRANCH}\" --regenerate-consistency-file\n\nBug: b:396593141\nChange-Id: I7cd9451b82bdd31a666fbad7253ef4ac796b12b2\n" }, { "commit": "3c1fad332c14ed9eacac694e7c06b61200b4f76c", "tree": "6819e01af49452fc1863924163d84c20b82642a0", "parents": [ "b8c58edbbe33914cdb6332346a1b8ee0ce8ce59a" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 15:51:35 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:51:50 2025 +0000" }, "message": "[133.0.6876.3 v2] Add ToT/Stable build files\n\nThe code in this commit was generated from the branch representing this\nimport:\nhttps://chromium.googlesource.com/experimental/chromium/src/+/refs/wip/cronet/aosp-133.0.6876.3-v2.\nWith commit SHA: c431541ea3e4539b058ad2c4a117c4790d608b26.\n\nThis commit can be reproduced by running:\n$ gclient config --spec \u0027solutions \u003d [\n {\n \"name\": \"src\",\n \"url\": \"https://chromium.googlesource.com/experimental/chromium/src.git\",\n \"managed\": False,\n \"custom_deps\": {},\n \"custom_vars\": {\n \"checkout_copybara\": True,\n },\n },\n]\ntarget_os \u003d [\"android\"]\n\u0027 \u0026\u0026\ngclient sync --rev\u003drefs/wip/cronet/aosp-133.0.6876.3-v2 --shallow\n\nThen running the following commands:\n$ vpython3 components/cronet/gn2bp/run_gn2bp.py --channel\u003dtot --skip-copybara\n$ export DIR\u003dtot \u0026\u0026 find -name Android.bp.gn2bp | while read -r line; do cp -v \"$line\" \"${AOSP_REPO}/external/cronet/${DIR}/${line%.gn2bp}\"; done \u0026\u0026 cp third_party/boringssl/sources.bp \"${AOSP_REPO}/external/cronet/${DIR}/third_party/boringssl/sources.bp\" \u0026\u0026 cp third_party/boringssl/sources.mk \"${AOSP_REPO}/external/cronet/${DIR}/third_party/boringssl/sources.mk\" \u0026\u0026 cp Android.extras.bp.gn2bp \"${AOSP_REPO}/external/cronet/${DIR}/Android.extras.bp\"\n$ vpython3 components/cronet/gn2bp/run_gn2bp.py --channel\u003dstable --skip-copybara\n$ export DIR\u003dstable \u0026\u0026 find -name Android.bp.gn2bp | while read -r line; do cp -v \"$line\" \"${AOSP_REPO}/external/cronet/${DIR}/${line%.gn2bp}\"; done \u0026\u0026 cp third_party/boringssl/sources.bp \"${AOSP_REPO}/external/cronet/${DIR}/third_party/boringssl/sources.bp\" \u0026\u0026 cp third_party/boringssl/sources.mk \"${AOSP_REPO}/external/cronet/${DIR}/third_party/boringssl/sources.mk\" \u0026\u0026 cp Android.extras.bp.gn2bp \"${AOSP_REPO}/external/cronet/${DIR}/Android.extras.bp\"\n\nThis step is needed to regenerate copybara\u0027s consistency file after\nmoving everything into the import channel subdir.\n\nThis is effectively import v2 of Cronet version 133.0.6876.3: that\nimport has been reproduced under the new ToT and Stable import\nchannels.\n\nBug: b:396593141\nChange-Id: I037e25560fdca5496de5e4c1c63555b113968c9a\n" }, { "commit": "b8c58edbbe33914cdb6332346a1b8ee0ce8ce59a", "tree": "1125a58b61cc639b832cb6364e5bdbf0893e11ac", "parents": [ "9eb861a3f949775aaf26268502c8be2a1972d4d5" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 17:11:18 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:25:08 2025 +0000" }, "message": "[133.0.6876.3 v2] Apply cherry-picks\n\nThis commit include the cherry-picks applied on top of 133.0.6876 to\nproduce the current import v2. These are:\n1) http://crrev.com/c/6276929\n2) http://crrev.com/c/6287409\n3) http://crrev.com/c/6276930\n4) https://boringssl-review.googlesource.com/c/boringssl/+/76447\n\nThese can also be seen from the branch representing this import:\nhttps://chromium.googlesource.com/experimental/chromium/src/+/refs/wip/cronet/aosp-133.0.6876.3-v2.\nWith commit SHA: c431541ea3e4539b058ad2c4a117c4790d608b26.\n\nThis commit can be reproduced by running:\n$ gclient config --spec \u0027solutions \u003d [\n {\n \"name\": \"src\",\n \"url\": \"https://chromium.googlesource.com/experimental/chromium/src.git\",\n \"managed\": False,\n \"custom_deps\": {},\n \"custom_vars\": {\n \"checkout_copybara\": True,\n },\n },\n]\ntarget_os \u003d [\"android\"]\n\u0027 \u0026\u0026\ngclient sync --rev\u003drefs/wip/cronet/aosp-133.0.6876.3-v2 --shallow\n\nThen copying the contents of //components/cronet/{gn2bp, license} to\n//external/cronet/{stable, tot}/components/cronet/{gn2bp, license}.\n\nBug: b:396593141\nChange-Id: I57fe74549aa8d8871884382b68f3845125619bdf\n" }, { "commit": "9eb861a3f949775aaf26268502c8be2a1972d4d5", "tree": "ed0f3dfa084a0177932bfb6ed5609f75f0094348", "parents": [ "c9aa8eacff465876664a9b698e4fb0c632d9743f" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 15:02:05 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:12:34 2025 +0000" }, "message": "Introduce Cronet ToT import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the tot channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: remaining top level files\n\nBug: b:396593141\nChange-Id: I1606d6a63b9397e1e2f46b07240a606eb410cd29\n" }, { "commit": "c9aa8eacff465876664a9b698e4fb0c632d9743f", "tree": "78c34601a275a818efbcfdbf822be10f4a12d2f6", "parents": [ "3716010293f7f7736fca6d591dcdaf8c1aa7ef76" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 15:00:46 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:12:34 2025 +0000" }, "message": "Introduce Cronet ToT import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the tot channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: net/*\n\nBug: b:396593141\nChange-Id: I5eabc08c73bdc7179bb88a581bc06e45d7eb7695\n" }, { "commit": "3716010293f7f7736fca6d591dcdaf8c1aa7ef76", "tree": "3df3cfd283d900ac48b9d883c3dbb1cf72f34ca1", "parents": [ "7a508bd2a6feffcc77fb0797ef0af8c34af80558" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 15:00:04 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:12:33 2025 +0000" }, "message": "Introduce Cronet ToT import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the tot channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: crypto/*, ipc/*, testing/*, url/*\n\nBug: b:396593141\nChange-Id: I112b75d93267502a7ad0a6252f2f143d9831d35c\n" }, { "commit": "7a508bd2a6feffcc77fb0797ef0af8c34af80558", "tree": "4d815596fb30670e20f35d5db8d037a8db043a5d", "parents": [ "a5f1a7e8bfbeeb1898ffcf3fe9bb705b723d71ae" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 14:59:34 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:12:33 2025 +0000" }, "message": "Introduce Cronet ToT import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the tot channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: chrome/* and components/*\n\nBug: b:396593141\nChange-Id: I81cee6dd6331652fff0a2c43ce6b95dbfceeecac\n" }, { "commit": "a5f1a7e8bfbeeb1898ffcf3fe9bb705b723d71ae", "tree": "f4157149fac04cadd6f11dbdfdc868abf30577fb", "parents": [ "bbfeb342bef186c04ce45e94095b0298dea69309" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 14:58:57 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:12:32 2025 +0000" }, "message": "Introduce Cronet ToT import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the tot channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: build/* and buildtools/*\n\nBug: b:396593141\nChange-Id: I0cc0c5176dce32f5fb0cee9c770b93644b555185\n" }, { "commit": "bbfeb342bef186c04ce45e94095b0298dea69309", "tree": "895d74d7cad17bc39251255f2a0d9586074f35d9", "parents": [ "e28672bd25ea47f54189e467e70080bc90d656c3" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 14:41:17 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:12:32 2025 +0000" }, "message": "Introduce Cronet ToT import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the tot channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: remaining things in third_party/*\n\nBug: b:396593141\nChange-Id: I5c66f64ab46c7bf04f41328dc404cfe6cf892a8e\n" }, { "commit": "e28672bd25ea47f54189e467e70080bc90d656c3", "tree": "950fc26c80ffcc0d13601d31918ab6b647f55e2f", "parents": [ "88a55ed9f3d862d51100d60dbe1c648462008f2a" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 14:40:32 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:12:30 2025 +0000" }, "message": "Introduce Cronet ToT import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the tot channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: third_party/protobuf/*\n\nBug: b:396593141\nChange-Id: I4e0d62d7cf80959d79d2b749149f57f8c2ea4ba3\n" }, { "commit": "88a55ed9f3d862d51100d60dbe1c648462008f2a", "tree": "8e6bb72508fe1fe577c417dcab0a69cfc2a02480", "parents": [ "781c39e6829010e15e1393b701ebc1a229f21a97" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 14:39:53 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:12:30 2025 +0000" }, "message": "Introduce Cronet ToT import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the tot channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: third_party/libc++/*\n\nBug: b:396593141\nChange-Id: I0d0ca11d54474a43cbacf96b400f062240e803d7\n" }, { "commit": "781c39e6829010e15e1393b701ebc1a229f21a97", "tree": "157bf9137f3c272a8f6456c40c24672a8a854475", "parents": [ "f6a3c610b49cbbb8dfc70b13a2042f01d3d254aa" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 14:38:50 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:12:22 2025 +0000" }, "message": "Introduce Cronet ToT import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the tot channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: third_party/boringssl/*\n\nBug: b:396593141\nChange-Id: I36846be70f7d2544ab5c6f44e6435bfcee9637ad\n" }, { "commit": "f6a3c610b49cbbb8dfc70b13a2042f01d3d254aa", "tree": "3412fc8fbde384d1f351624cbe5214ffdd327706", "parents": [ "16fd0f7e8c1032e69b99b710120cc03ca456254a" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 14:34:39 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:12:03 2025 +0000" }, "message": "Introduce Cronet ToT import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the tot channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: base/*\n\nBug: b:396593141\nChange-Id: I427e89760f9b8bea7d4d01fbc979a711780ce40a\n" }, { "commit": "16fd0f7e8c1032e69b99b710120cc03ca456254a", "tree": "596a22ebf26c965a4c022e8552295033ebd20cfe", "parents": [ "e169fa187104bba8c5d748f1fd37901fed157247" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 14:30:51 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:12:03 2025 +0000" }, "message": "Introduce Cronet Stable import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the stable channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: remaining top level files\n\nBug: b:396593141\nChange-Id: Iffafb2b67c5413c893c9c06862ed0916aa003423\n" }, { "commit": "e169fa187104bba8c5d748f1fd37901fed157247", "tree": "518fc5a119db954ed0880e93a5c47c8d81d987f2", "parents": [ "b7acbf362dcc256fceef57c49bd25f04d2efcc33" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 14:28:54 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:12:03 2025 +0000" }, "message": "Introduce Cronet Stable import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the stable channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: net/*\n\nBug: b:396593141\nChange-Id: I9a676986d28bfe32612b8ce11369f0970bc21f4c\n" }, { "commit": "b7acbf362dcc256fceef57c49bd25f04d2efcc33", "tree": "a84fb8ca655293163909db0bd13a6c0e504f5376", "parents": [ "1e0313bd7c1c3ae08f0c9bd872c40fe1aa4be7ae" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 14:27:48 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:12:02 2025 +0000" }, "message": "Introduce Cronet Stable import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the stable channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: crypto/*, ipc/*, testing/*, url/*\n\nBug: b:396593141\nChange-Id: I10df5f8344c24f1f95f87787234a6b3d85a149a4\n" }, { "commit": "1e0313bd7c1c3ae08f0c9bd872c40fe1aa4be7ae", "tree": "c8a619beb6df8ea98e7117389fa9e778262d4bae", "parents": [ "d8c1aa2665a829d50deed43b4e1dbc4d637771d7" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 14:25:45 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:12:02 2025 +0000" }, "message": "Introduce Cronet Stable import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the stable channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: chrome/* and components/*\n\nBug: b:396593141\nChange-Id: Ie7b0c7616ca8172c31a602829a3f15f61b4518b4\n" }, { "commit": "d8c1aa2665a829d50deed43b4e1dbc4d637771d7", "tree": "714e6f9009fa1951f23d12ffccf4ff896005d060", "parents": [ "4dc2f703313cec76e09ad4d5e237b12f133aceb7" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 14:23:30 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:12:02 2025 +0000" }, "message": "Introduce Cronet Stable import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the stable channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: build/* and buildtools/*\n\nBug: b:396593141\nChange-Id: Ifd0fb226e0dbf7e8df099a7d5c81b4a7a23f3d25\n" }, { "commit": "4dc2f703313cec76e09ad4d5e237b12f133aceb7", "tree": "bc69d3c85144085ce40ba6ecb19bb20948f32343", "parents": [ "d246669b40818343a68c46ec8e13de367a982bc5" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 14:11:12 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:12:01 2025 +0000" }, "message": "Introduce Cronet Stable import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the stable channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: remaining things in third_party/*\n\nBug: b:396593141\nChange-Id: Ifba7a56a6b5925bf20a82fd7c54fd46d10a614ad\n" }, { "commit": "d246669b40818343a68c46ec8e13de367a982bc5", "tree": "b38acd8db1e7e939edea9012b22bad84abc81976", "parents": [ "761a81d32fc1f50a8f201628d1888b12d9bc01d9" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 14:10:41 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:12:00 2025 +0000" }, "message": "Introduce Cronet Stable import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the stable channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: third_party/protobuf/*\n\nBug: b:396593141\nChange-Id: I01f7a1942a12fbab529dca8b875215e29474b3b0\n" }, { "commit": "761a81d32fc1f50a8f201628d1888b12d9bc01d9", "tree": "64e84e6d91e31429ce530ea817f456288d78eea8", "parents": [ "ff07f83453eb7f63ec52792e53ce731ac6bd1c0e" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 14:08:12 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:11:59 2025 +0000" }, "message": "Introduce Cronet Stable import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the stable channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: third_party/libc++/*\n\nBug: b:396593141\nChange-Id: Icacc077373f72c912a1da20bec3b80507f6f2aff\n" }, { "commit": "ff07f83453eb7f63ec52792e53ce731ac6bd1c0e", "tree": "6e11cf06d75c9f9504f4a0a0003634c8c27f30c3", "parents": [ "7985110d5c56cf23664e2e96ed2fffdfaaf47852" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 14:07:31 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Thu Mar 13 15:11:53 2025 +0000" }, "message": "Introduce Cronet Stable import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the stable channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: third_party/boringssl/*\n\nBug: b:396593141\nChange-Id: I6f21ae855c930b082dc1661b4e2499fc71c7ffea\n" }, { "commit": "24f3afdc8b1a2d33b635bdc8c7ba40f90cb72130", "tree": "edc03a3d0192db60ffc79202446f1f3dbeb3bdb7", "parents": [ "b8f367ab5fe7c52fc24897c60691e18cfa86092f", "6989c2052c47c23de4c0a879efdfa4f04e0acf23" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Mar 12 07:17:13 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 12 07:17:13 2025 -0700" }, "message": "Merge \"Stop overriding flags in CTS tests\" into main" }, { "commit": "7985110d5c56cf23664e2e96ed2fffdfaaf47852", "tree": "deb00bfce93a5f0ee308be3c40ef49017153d864", "parents": [ "c68e25cb6f77afd2549613f441ab73761c84eaa4" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 25 13:44:14 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Wed Mar 12 13:08:27 2025 +0000" }, "message": "Introduce Cronet Stable import channel\n\nAOSP will have two Cronet versions at any given time:\n1. ToT - Tracking Chromium\u0027s HEAD as close as possible\n2. Stable - Tracking Chromium\u0027s Stable channel\n\nThis CL starts importing the stable channel. This is done in multiple\nsteps as gerrit cannot handle an entire import of Cronet in one go (too\nmany files).\n\nImporting: base/*\n\nBug: b:396593141\nChange-Id: I3de5fa8e98bbb833957abeaac6fb0eeb86ba002d\n" }, { "commit": "6989c2052c47c23de4c0a879efdfa4f04e0acf23", "tree": "2b05f244f2666706cad29419a84a07ca82f93e95", "parents": [ "c68e25cb6f77afd2549613f441ab73761c84eaa4" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Tue Mar 11 12:38:49 2025 +0000" }, "committer": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Wed Mar 12 06:05:03 2025 -0700" }, "message": "Stop overriding flags in CTS tests\n\nOverriding flags seems to be explicitly disabled as per the\n[documentation](https://g3doc.corp.google.com/company/teams/android-core-experiments/trunk-stable/class-and-method-level-flag-override.md?cl\u003dhead).\n\nxTS tests are supposed to be flag-agnostic which was not the case and\nthis has caused b/402303876 to occur, the alternative here is to use flag filtering. However, we think that the tests are no longer necessary at this point due to the fact that they run the default behavior which is what the current tests already do; We removed the tests.\n\nTested: m cts \u0026\u0026 run cts -m CtsNetHttpTestCases -t android.net.http.cts.HttpEngineTest\nBug: 402303876\nChange-Id: I122dfe774f35dfa4d796b20f6c488bd102bddc8d\n" }, { "commit": "b8f367ab5fe7c52fc24897c60691e18cfa86092f", "tree": "ea698949aa64ead28ffdf089761ee1a0557dbd59", "parents": [ "946d58396b57d61daa3635f53a267c0474a86326", "bafbefef9ccb777add9556072afd460d9d9fc295" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Wed Mar 12 05:57:22 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 12 05:57:22 2025 -0700" }, "message": "Merge \"Remove reuseBuilder for headers test for bidi stream\" into main" }, { "commit": "946d58396b57d61daa3635f53a267c0474a86326", "tree": "a612f5d5034b301b3fbd0b031de8f3629ae40e9b", "parents": [ "c68e25cb6f77afd2549613f441ab73761c84eaa4", "bc3aaf1f62e802b3cab9d5fff75dbc2d9f23b6c1" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Wed Mar 12 05:00:28 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Wed Mar 12 05:00:28 2025 -0700" }, "message": "Merge \"Don\u0027t preload Cronet excluded classes\" into main" }, { "commit": "bafbefef9ccb777add9556072afd460d9d9fc295", "tree": "67d376b70e28960792ff4149a131f70cc1b7cbe3", "parents": [ "c68e25cb6f77afd2549613f441ab73761c84eaa4" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Wed Mar 12 11:33:42 2025 +0000" }, "committer": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Wed Mar 12 11:38:52 2025 +0000" }, "message": "Remove reuseBuilder for headers test for bidi stream\n\nThe behaviour of reusing builders for bidi is undefined as it will\ndepend on the version of HttpEngine. I previously tried to implement\na CTS test for the new behaviour which broke multiple times in testing\nso I\u0027m giving up on this by deleting the test.\n\nBug: 402634857\nChange-Id: Ib9144965536300814b047a4710013d24234022a9\n" }, { "commit": "bc3aaf1f62e802b3cab9d5fff75dbc2d9f23b6c1", "tree": "23c0645569a3a8a643f27f7f422941ec4a6a821c", "parents": [ "e05501550b3b70236b6c53f77befe65e1f87020f" ], "author": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Mon Mar 10 16:59:28 2025 +0000" }, "committer": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Tue Mar 11 13:20:08 2025 +0000" }, "message": "Don\u0027t preload Cronet excluded classes\n\nOtherwise https://crrev.com/c/6333413 breaks preload as it strips\norg.chromium.build.NativeLibraries which one of these classes depends\non.\n\nBug: 397396295\nBug: 380356540\nChange-Id: I41fce6b3076af4466433427c25001b59d7ea5884\n" }, { "commit": "8e2b8e67a1ab6be148d1b2a4cbb23b33d3ac6b24", "tree": "25682069c8e307c3a352bd0762ad7de6f2e3cbcc", "parents": [ "c68e25cb6f77afd2549613f441ab73761c84eaa4" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Wed Feb 19 16:47:22 2025 +0000" }, "committer": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Tue Mar 11 05:53:22 2025 -0700" }, "message": "Fix kotlin formatter\n\nThe formatter was completely broken and was doing nothing, this fixes\nthe formatter by specifying the correct path and added\n`--kotlinlang-style` which is the current formatting style used in our\ntests.\n\nChange-Id: I5ea2c662e74ce6d11e33a11b7c617cf949d34728\n" }, { "commit": "c68e25cb6f77afd2549613f441ab73761c84eaa4", "tree": "a506d218f5fc5fc60ebd1e154fd5c9588d3f905c", "parents": [ "fe87089991ce9b87085c7b235ddfbc0489aaeeb2", "eb47bca1aaa0c3388ffa84c5edfda5ab441fb805" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Tue Mar 11 03:58:26 2025 -0700" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Mar 11 03:58:26 2025 -0700" }, "message": "Merge \"Remove divergence from HttpEngine getters [Reland aosp/3494762]\" into main" }, { "commit": "eb47bca1aaa0c3388ffa84c5edfda5ab441fb805", "tree": "a506d218f5fc5fc60ebd1e154fd5c9588d3f905c", "parents": [ "e05501550b3b70236b6c53f77befe65e1f87020f" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Fri Feb 21 14:48:55 2025 +0000" }, "committer": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Tue Mar 04 10:51:43 2025 +0000" }, "message": "Remove divergence from HttpEngine getters [Reland aosp/3494762]\n\nSome APIs were introduced to HttpEngine which are not available in\nCronet. Unfortunately, they were implemented by directly introducing\nthose new APIs in Cronet for AOSP only but not Chromium. This introduced\ndivergence.\n\nThis makes the wrapper layer more complex, but keeps the complexity\nlocalized as much as possible.\n\nAdded new CTS tests to ensure that functionlity does not break\nin the future since we\u0027re now duplicating code that were previously\nexisting inside Cronet and was tested through the MTS.\n\nBug: 397215224\nTest: atest NetHttpCoverageTests\nChange-Id: I935fc140b919cbddc69407e802f87787f9410d58\n" }, { "commit": "fe87089991ce9b87085c7b235ddfbc0489aaeeb2", "tree": "8e57eb562e80e8f64fb628b40ffb25d4a3b6f804", "parents": [ "cf116de4d62f01c7c1613fa1dd3649a767d6771e", "e05501550b3b70236b6c53f77befe65e1f87020f" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Mon Mar 03 03:18:29 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Mar 03 03:18:29 2025 -0800" }, "message": "Revert \"Remove divergence from HttpEngine getters\" am: e05501550b\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3517171\n\nChange-Id: I72e74212b3c058c4740ff29db30fc2b578def35c\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "e05501550b3b70236b6c53f77befe65e1f87020f", "tree": "8e57eb562e80e8f64fb628b40ffb25d4a3b6f804", "parents": [ "a4a2222f9bba40894dc013ab260805b3f59da641" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Fri Feb 28 05:57:16 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Feb 28 05:57:16 2025 -0800" }, "message": "Revert \"Remove divergence from HttpEngine getters\"\n\nThis reverts commit a4a2222f9bba40894dc013ab260805b3f59da641.\n\nReason for revert: b/399484961, we will revert now to unblock the pony landing then re-land once we have got working a CL.\n\nChange-Id: I199c9d79a590f31a3d06718f049c4132f752670f\n" }, { "commit": "cf116de4d62f01c7c1613fa1dd3649a767d6771e", "tree": "9139d50c69ac86d84d5e4d263944fc8413286672", "parents": [ "f3a3a33cc47475fc0f9e8dbff524358075fc8b59", "a4a2222f9bba40894dc013ab260805b3f59da641" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Wed Feb 26 10:44:41 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Feb 26 10:44:41 2025 -0800" }, "message": "Remove divergence from HttpEngine getters am: a4a2222f9b\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3494762\n\nChange-Id: I7782e2d1bed7a6c27dc24fd7e9be0c1fa8131d12\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a4a2222f9bba40894dc013ab260805b3f59da641", "tree": "9139d50c69ac86d84d5e4d263944fc8413286672", "parents": [ "d6de2c9b9a6aa46eeeda8195b0e90546221dbf1e" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Fri Feb 21 14:48:55 2025 +0000" }, "committer": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Wed Feb 26 16:03:12 2025 +0000" }, "message": "Remove divergence from HttpEngine getters\n\nSome APIs were introduced to HttpEngine which are not available in\nCronet. Unfortunately, they were implemented by directly introducing\nthose new APIs in Cronet for AOSP only but not Chromium. This introduced\ndivergence.\n\nThis makes the wrapper layer more complex, but keeps the complexity\nlocalized as much as possible.\n\nBug: 397215224\nTest: atest NetHttpCoverageTests\nChange-Id: I65be4bf1be35454754039db380cdd7e8fa7d7631\n" }, { "commit": "f3a3a33cc47475fc0f9e8dbff524358075fc8b59", "tree": "8e57eb562e80e8f64fb628b40ffb25d4a3b6f804", "parents": [ "ab3602929a7a8db9e04d0795c33a1dde689c7aa0", "d6de2c9b9a6aa46eeeda8195b0e90546221dbf1e" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Fri Feb 21 09:34:29 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Feb 21 09:34:29 2025 -0800" }, "message": "Move the excluded tests from the TEST_MAPPING to the XML configuration am: d6de2c9b9a\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3500954\n\nChange-Id: Iaad7e4a0f01b4404e6ee80c1f58ae959cc722fe9\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "d6de2c9b9a6aa46eeeda8195b0e90546221dbf1e", "tree": "8e57eb562e80e8f64fb628b40ffb25d4a3b6f804", "parents": [ "8183cd7038236c2a2f6e09f27dd7113757c912ce" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Fri Feb 21 15:02:51 2025 +0000" }, "committer": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Fri Feb 21 16:10:57 2025 +0000" }, "message": "Move the excluded tests from the TEST_MAPPING to the XML configuration\n\nCoverage run disregards the TEST_MAPPING completely as it is not meant\nto be integrated with it which means that if we disable a test through\nthe TEST_MAPPING then it will still keep running through coverage runs.\nBy moving to the AndroidNetTest.xml then the excluded filter will be\nrespected regardless of where the tests are executed.\n\nBug: 398135623\nChange-Id: I02ffed524fb760ccf7720d3989d0dd04459e6601\n" }, { "commit": "ab3602929a7a8db9e04d0795c33a1dde689c7aa0", "tree": "0b475049e696ea9ac96dceb035be313b1971f35b", "parents": [ "aedf115c8da33893a4c0baa5361182a84ef71d52", "8183cd7038236c2a2f6e09f27dd7113757c912ce" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Feb 18 12:33:10 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 18 12:33:10 2025 -0800" }, "message": "Merge \"Revert https://r.android.com/3478320\" into main am: 8183cd7038\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3499311\n\nChange-Id: I5793bac00a8f06e3f29a9f089e818d5ef72d2d71\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8183cd7038236c2a2f6e09f27dd7113757c912ce", "tree": "0b475049e696ea9ac96dceb035be313b1971f35b", "parents": [ "19f49d6b60a1fa1b55cd585c34b95ff6fa9553de", "a8e5ae121d60d2b92bd9504bb129553928e6d308" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Feb 18 12:03:54 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 18 12:03:54 2025 -0800" }, "message": "Merge \"Revert https://r.android.com/3478320\" into main" }, { "commit": "a8e5ae121d60d2b92bd9504bb129553928e6d308", "tree": "301fb60710718384cc7a1d75ba37c9b09813797d", "parents": [ "888700676fe4739631464f90b8b04d8e05a98554" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Tue Feb 18 16:51:18 2025 +0000" }, "committer": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Tue Feb 18 16:51:18 2025 +0000" }, "message": "Revert https://r.android.com/3478320\n\nThe CL has caused a memory regression in the Zygote, See: b/396156852\n\nTest: Compile\nChange-Id: I4d656ec492c881fdaed24a36c2bf86a31578fd17\n" }, { "commit": "aedf115c8da33893a4c0baa5361182a84ef71d52", "tree": "7107fefc2850f7dd83aa37bca5860ca0bd49b6ed", "parents": [ "6a12274f8d2fd22874cf27c72de4fc7221beb92f", "19f49d6b60a1fa1b55cd585c34b95ff6fa9553de" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 18 04:06:30 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 18 04:06:30 2025 -0800" }, "message": "Merge \"\"Fix\" 133.0.6876.3 import\" into main am: 19f49d6b60\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3494795\n\nChange-Id: I14af1393a705bd581f5376cac7f80d0ac9b7a86f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "19f49d6b60a1fa1b55cd585c34b95ff6fa9553de", "tree": "7107fefc2850f7dd83aa37bca5860ca0bd49b6ed", "parents": [ "888700676fe4739631464f90b8b04d8e05a98554", "18acaa30f3b87ab9c08285b14e80b3dc2d1888da" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 18 03:34:41 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 18 03:34:41 2025 -0800" }, "message": "Merge \"\"Fix\" 133.0.6876.3 import\" into main" }, { "commit": "18acaa30f3b87ab9c08285b14e80b3dc2d1888da", "tree": "a9565e9b030a7b80b9c51bf7dd3c54fcfff541d9", "parents": [ "3a7877a01469fd4834f5b1672166b2779e5a873f" ], "author": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Mon Feb 17 17:00:39 2025 +0000" }, "committer": { "name": "Stefano Duo", "email": "stefanoduo@google.com", "time": "Tue Feb 18 03:34:28 2025 -0800" }, "message": "\"Fix\" 133.0.6876.3 import\n\nThis is what I\u0027ve got while trying to reproduce the import with the\ninstructions in aosp/3496991\n\nBug: b:396593141\nChange-Id: I478d099792659f75e529d87b414582c2f9368852\n" }, { "commit": "6a12274f8d2fd22874cf27c72de4fc7221beb92f", "tree": "a455ea729a45df26cc090351648a71524d5b803e", "parents": [ "d377855e1a34d564619ef270baa0f2de4c8ab78a", "888700676fe4739631464f90b8b04d8e05a98554" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Mon Feb 17 09:48:28 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 17 09:48:28 2025 -0800" }, "message": "Remove package-private visibility divergence am: 888700676f\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3494794\n\nChange-Id: I31b77bc75ea03dd8b373a4ba0db96bc248014212\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "888700676fe4739631464f90b8b04d8e05a98554", "tree": "a455ea729a45df26cc090351648a71524d5b803e", "parents": [ "3a7877a01469fd4834f5b1672166b2779e5a873f" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Mon Feb 17 15:47:03 2025 +0000" }, "committer": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Mon Feb 17 15:59:09 2025 +0000" }, "message": "Remove package-private visibility divergence\n\nPreviously, we had to make some methods / classes public instead of\npackage-private because our testing setup was JarJaring some classes\nand not jarjaring others which broke the package-visibility. We\u0027re no\nlonger jarjaring anything for the test classes which means that this\ndivergence can be removed finally.\n\nUsed aosp/3417439 and the HEAD chromium.bara.consistency as SoT for\ndivergence.\n\nFix: 394583271\nBug: 394583271\nTest: TH\nChange-Id: I75e8dace7b201114888a02050c27d518d46a39c4\n" }, { "commit": "d377855e1a34d564619ef270baa0f2de4c8ab78a", "tree": "599021d5e048ccc71205ec25695b1c58bc311518", "parents": [ "635de431949caac0d974c9b132a20684c889bf80", "3a7877a01469fd4834f5b1672166b2779e5a873f" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Feb 17 05:50:42 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 17 05:50:42 2025 -0800" }, "message": "Merge \"Stop jarjaring Cronet MTS tests\" into main am: 3a7877a014\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3494812\n\nChange-Id: I66a3dcb33eaead386ba33617c7802f11f33e20b4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3a7877a01469fd4834f5b1672166b2779e5a873f", "tree": "599021d5e048ccc71205ec25695b1c58bc311518", "parents": [ "109ea4ba921e1120d0397d391f3c545ae6254378", "9723cf03770681fa1fbb99a9128e23563c286c1a" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Feb 17 05:24:39 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Feb 17 05:24:39 2025 -0800" }, "message": "Merge \"Stop jarjaring Cronet MTS tests\" into main" }, { "commit": "635de431949caac0d974c9b132a20684c889bf80", "tree": "f63c488e0b81fa0d7f4ba19fa72500620183757e", "parents": [ "71e975fa54c056d088ea4b55f3fb3073870d2a5f", "109ea4ba921e1120d0397d391f3c545ae6254378" ], "author": { "name": "Cronet Mainline Eng", "email": "cronet-mainline-eng+copybara@google.com", "time": "Mon Feb 17 03:15:32 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 17 03:15:32 2025 -0800" }, "message": "Import Cronet 133.0.6876.3 into AOSP am: 109ea4ba92\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3496991\n\nChange-Id: I7bafd8d777b9a8325bd405bfd98e6fed4ec44feb\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "109ea4ba921e1120d0397d391f3c545ae6254378", "tree": "f63c488e0b81fa0d7f4ba19fa72500620183757e", "parents": [ "59350f7885dc33e450ed8601ee8e9b4f9471ebd8" ], "author": { "name": "Cronet Mainline Eng", "email": "cronet-mainline-eng+copybara@google.com", "time": "Fri Feb 14 14:47:13 2025 +0000" }, "committer": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Fri Feb 14 17:47:15 2025 +0000" }, "message": "Import Cronet 133.0.6876.3 into AOSP\n\nThis commit brings in Cronet from Chromium 133.0.6876.3 (plus cherry-picks) into\nAOSP, along with merge conflict resolutions and spot fixes.\n\nWHAT THIS COMMIT CONTAINS\n\nThe code in this commit was imported from:\n\n https://chromium.googlesource.com/experimental/chromium/src/+/refs/wip/cronet/aosp-133.0.6876.3\n Commit SHA: 244475f688daad04edc5b276d2c42c83992994fc\n\nThis commit is a descendant of Chromium src tag 133.0.6876.3 (faf69aee), with\nthe following commits added on top:\n\n - 51 commits that were already backported from the Chromium src main branch\n in the previous import;\n - 9 commits newly backported from the Chromium src main branch;\n - 2 commits that are specific to 133.0.6876.3 and are not going to be submitted\n to the Chromium src main branch.\n\nThe only other changes made in this CL on top of the imported code is resolution\nof merge conflicts and a spot fix for third_party/boringssl/Android.bp.\n\nHOW TO REPRODUCE THIS COMMIT\n\nThe contents of this commit (minus the manual adjustments) can be reproduced by\nrunning:\n\n gclient config --spec \u0027solutions \u003d [\n {\n \"name\": \"src\",\n \"url\": \"https://chromium.googlesource.com/experimental/chromium/src.git\",\n \"managed\": False,\n \"custom_deps\": {},\n \"custom_vars\": {\n \"checkout_copybara\": True,\n },\n },\n ]\n target_os \u003d [\"android\"]\n \u0027 \u0026\u0026\n gclient sync --rev\u003drefs/wip/cronet/aosp-133.0.6876.3 --shallow \u0026\u0026\n cd src \u0026\u0026\n vpython3 components/cronet/gn2bp/run_gn2bp.py\n\nWhen running this command on top of this commit, the result is expected to be an\nempty diff.\n\nFixes: 396076243\nChange-Id: If9da670daa5ad64ad6a593bb245dad95a7566f0d\n" }, { "commit": "9723cf03770681fa1fbb99a9128e23563c286c1a", "tree": "453dd553babb7fe4ec4f53f51a2f7636074860eb", "parents": [ "59350f7885dc33e450ed8601ee8e9b4f9471ebd8" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Thu Feb 13 16:11:41 2025 +0000" }, "committer": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Thu Feb 13 16:11:41 2025 +0000" }, "message": "Stop jarjaring Cronet MTS tests\n\nCronet MTS Tests are our only source of coverage and confidence that\nHttpEngine is working as intended, we were initially JarJaring those\ntests to match what we ship in the platform so we could test the\nplatform code via this channel. However, this is no longer necessary\nbecause we have HttpEngineWrapper which tests the platform code via\nCronetEngine codepath without JarJar.\n\nJarJar has also caused headache when importing as we have to make some\nclasses public instead of package-private in order to access them after\nwe JarJar. There\u0027s also the complexity of the blurry line of \"is the\ncode being executed in the Platform or inside the APK?\".\n\nFinally, the JarJaring setup will completely break once we try to roll\nhttps://crrev.com/c/6226162 as it assumes there\u0027s a single shared\nlibrary whose name is `libcronet_tests` which will not be bundled\nin the platform while we\u0027ll be asking platform to do that.\n\nBug: 394583271\nChange-Id: I159a00b5d7f6eacb85afbe5198a33dae28093d4b\n" }, { "commit": "71e975fa54c056d088ea4b55f3fb3073870d2a5f", "tree": "951bbe3fecde8ba35753742b468c7be4e2a2b51a", "parents": [ "e61604c1e9950413f18127a9e76b25aeb2784302", "59350f7885dc33e450ed8601ee8e9b4f9471ebd8" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Feb 11 15:21:43 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Tue Feb 11 15:21:43 2025 -0800" }, "message": "Merge \"Add metric to count preload attempts\" into main am: 59350f7885\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3478320\n\nChange-Id: Id2abeeff285eaa45b436c0f5568c6f6ad7bd5425\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "59350f7885dc33e450ed8601ee8e9b4f9471ebd8", "tree": "951bbe3fecde8ba35753742b468c7be4e2a2b51a", "parents": [ "3548f3dba79dcd60cf7dcf7754ca8e754ce67c6f", "aa10650280b330be7b48ad055c4072c065efffcc" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Tue Feb 11 15:13:22 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Tue Feb 11 15:13:22 2025 -0800" }, "message": "Merge \"Add metric to count preload attempts\" into main" }, { "commit": "aa10650280b330be7b48ad055c4072c065efffcc", "tree": "081c258db31ee9c107f20317f6b4b82382ca5187", "parents": [ "05b19d9f24e0303d29ab78b5577d8de20c8eb5d3" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Thu Feb 06 15:20:26 2025 +0000" }, "committer": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Fri Feb 07 12:29:23 2025 +0000" }, "message": "Add metric to count preload attempts\n\nThis metric is using telemetry express but in this scenario, this is\nfine because the caller is Zygote which is an allowed log-source. This\nwill be used to understand how often is HttpEngine preloaded across\ndifferent SDKs.\n\nTest: statsd_testdrive 528 and confirmed that the metricId shows up in\nthe logs. I also confirmed that statsd receives the metric via some\nmanual changes.\nBug: 380349437\n\nChange-Id: I9696223dcc789863711c6b3655742d124f4a5183\n" }, { "commit": "e61604c1e9950413f18127a9e76b25aeb2784302", "tree": "cc6377470cd7a3acde0609c6feb4e1ebdd90ff6e", "parents": [ "911bf0c22b5713bac0ff0918865e4c394f7bbf6a", "3548f3dba79dcd60cf7dcf7754ca8e754ce67c6f" ], "author": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Thu Feb 06 09:46:07 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Feb 06 09:46:07 2025 -0800" }, "message": "Don\u0027t jarjar jni_zero classes in Cronet tests am: 3548f3dba7\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3478132\n\nChange-Id: I3b9cec16ba6472f0721cf6b5c0df41775dbaa123\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3548f3dba79dcd60cf7dcf7754ca8e754ce67c6f", "tree": "cc6377470cd7a3acde0609c6feb4e1ebdd90ff6e", "parents": [ "05b19d9f24e0303d29ab78b5577d8de20c8eb5d3" ], "author": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Thu Feb 06 15:16:57 2025 +0000" }, "committer": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Thu Feb 06 15:26:26 2025 +0000" }, "message": "Don\u0027t jarjar jni_zero classes in Cronet tests\n\nThis is in preparation for importing https://crrev.com/c/6062739, which\nis apparently the first time a jni_zero Java class (in this case,\n`org.jni_zero.JniInit`) is being used from native code in\ncronet_tests.so.\n\nBug: 394038382\nChange-Id: I4f1870bceac530704f90014c6f2effa34a2b23b8\n" }, { "commit": "911bf0c22b5713bac0ff0918865e4c394f7bbf6a", "tree": "400fef60cb17939a734fed4ef27a7e954415d2ea", "parents": [ "95d6a011326ae23254e919870d1aea5a0f7b43e6", "05b19d9f24e0303d29ab78b5577d8de20c8eb5d3" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Mon Feb 03 07:32:34 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Feb 03 07:32:34 2025 -0800" }, "message": "Upstream formatting diff in crrev.com/c/6225659 am: 05b19d9f24\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3473591\n\nChange-Id: If87e9ef5e953239d8fbe5c3ebd6f6fed97611ab3\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "05b19d9f24e0303d29ab78b5577d8de20c8eb5d3", "tree": "400fef60cb17939a734fed4ef27a7e954415d2ea", "parents": [ "3ec6f5b268189c117881fe325a64892f2698fdd0" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Mon Feb 03 14:11:50 2025 +0000" }, "committer": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Mon Feb 03 14:11:50 2025 +0000" }, "message": "Upstream formatting diff in crrev.com/c/6225659\n\nChange-Id: I1de2a066dcbb14b265039c388e4e605f7e894848\n" }, { "commit": "95d6a011326ae23254e919870d1aea5a0f7b43e6", "tree": "18f9c1feb9685825d3a3fbd9bb7ec761a0b27ba6", "parents": [ "0b1eb2c67a9e15f64d0751c3ed74a3d0a0d90989", "3ec6f5b268189c117881fe325a64892f2698fdd0" ], "author": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Fri Jan 31 08:08:58 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 31 08:08:58 2025 -0800" }, "message": "Prefix bindgen static inline modules with \"lib\" am: 3ec6f5b268\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3469331\n\nChange-Id: Id5c4c5d92dc999ff5ec60acec6bd8e4b75ea2652\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "3ec6f5b268189c117881fe325a64892f2698fdd0", "tree": "18f9c1feb9685825d3a3fbd9bb7ec761a0b27ba6", "parents": [ "91c934c9b613a016176dc2a4c90a614c208c3d57" ], "author": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Fri Jan 31 14:09:18 2025 +0000" }, "committer": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Fri Jan 31 14:09:18 2025 +0000" }, "message": "Prefix bindgen static inline modules with \"lib\"\n\nThis was requested by the AOSP Rust team.\n\nThis reflects the output of https://crrev.com/c/6218801.\n\nChange-Id: I2e507cbdea97de4faa7713721ac93ecc4579729e\n" }, { "commit": "0b1eb2c67a9e15f64d0751c3ed74a3d0a0d90989", "tree": "59a787683649f48ba312d267069fc116096cd7b0", "parents": [ "1277fd152e2eddd7ec1379cafd9ce552e6300b31", "91c934c9b613a016176dc2a4c90a614c208c3d57" ], "author": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Thu Jan 30 10:51:06 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 30 10:51:06 2025 -0800" }, "message": "Import Cronet 132.0.6808.3 into AOSP am: 91c934c9b6\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3471668\n\nChange-Id: Iec690c1ae066782680517651f850b906cf039a95\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "91c934c9b613a016176dc2a4c90a614c208c3d57", "tree": "59a787683649f48ba312d267069fc116096cd7b0", "parents": [ "627b0f2aa49143747a5938308fb10444ea0b8dab" ], "author": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Thu Jan 30 14:51:38 2025 +0000" }, "committer": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Thu Jan 30 15:54:38 2025 +0000" }, "message": "Import Cronet 132.0.6808.3 into AOSP\n\nThis commit brings in Cronet from Chromium 132.0.6808.3 (plus cherry-picks) into\nAOSP, along with merge conflict resolutions.\n\nWHAT THIS COMMIT CONTAINS\n\nThe code in this commit was imported from:\n\n https://chromium.googlesource.com/experimental/chromium/src/+/refs/wip/cronet/aosp-132.0.6808.3\n Commit SHA: 7a951e79b67bfc399fcc587745ab9613bf567517\n\nThis commit is a descendant of Chromium src tag 132.0.6808.3 (06e4dca5), with\nthe following commits added on top:\n\n - 51 commits that were already backported from the Chromium src main branch\n in the previous import;\n - 5 commits newly backported from the Chromium src main branch;\n - 2 commits that are not yet on the Chromium src main branch, but will be soon;\n - 3 commits that are specific to 132.0.6808.3 and are not going to be submitted\n to the Chromium src main branch.\n\nThe only other change made in this CL on top of the imported code is resolution\nof merge conflicts.\n\nHOW TO REPRODUCE THIS COMMIT\n\nThe contents of this commit (minus the manual adjustments) can be reproduced by\nrunning:\n\n gclient config --spec \u0027solutions \u003d [\n {\n \"name\": \"src\",\n \"url\": \"https://chromium.googlesource.com/experimental/chromium/src.git\",\n \"managed\": False,\n \"custom_deps\": {},\n \"custom_vars\": {\n \"checkout_copybara\": True,\n },\n },\n ]\n target_os \u003d [\"android\"]\n \u0027 \u0026\u0026\n gclient sync --rev\u003drefs/wip/cronet/aosp-132.0.6808.3 --shallow \u0026\u0026\n cd src \u0026\u0026\n vpython3 components/cronet/gn2bp/run_gn2bp.py\n\nWhen running this command on top of this commit, the result is expected to be an\nempty diff.\n\nFixes: 392052561\nChange-Id: I3f0825a773e12865a33b49355f9b053be3dba116\n" }, { "commit": "1277fd152e2eddd7ec1379cafd9ce552e6300b31", "tree": "ce973c21bdeafffce689e5ac2b018d0a4f9afa31", "parents": [ "5e125cfd6212c08b9c99db3cad5aa19c9ef051d6", "627b0f2aa49143747a5938308fb10444ea0b8dab" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Wed Jan 29 03:24:38 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Wed Jan 29 03:24:38 2025 -0800" }, "message": "Remove license_converter_test from TEST_MAPPING. am: 627b0f2aa4\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3468044\n\nChange-Id: Icb56d75a76edda569c3ca1847fe9355de47fcd6e\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "627b0f2aa49143747a5938308fb10444ea0b8dab", "tree": "ce973c21bdeafffce689e5ac2b018d0a4f9afa31", "parents": [ "b3af9c5237321df174b7b10cfe48f315334bc085" ], "author": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Tue Jan 28 23:44:25 2025 +0000" }, "committer": { "name": "Krzysztof Kosiński", "email": "krzysio@google.com", "time": "Tue Jan 28 23:44:25 2025 +0000" }, "message": "Remove license_converter_test from TEST_MAPPING.\n\nThe test was deleted in aosp/3464267.\n\nTest: N/A\nBug: 381421702\nChange-Id: If4874a564a4c522e75651f2f2816842cf5b2c354\n" }, { "commit": "5e125cfd6212c08b9c99db3cad5aa19c9ef051d6", "tree": "f5e2027a82b7ca03136077735be6f74a322e3277", "parents": [ "d5d87c34e649b68418574581fe9d15232d243f9a", "b3af9c5237321df174b7b10cfe48f315334bc085" ], "author": { "name": "Chris Wailes", "email": "chriswailes@google.com", "time": "Mon Jan 27 19:52:35 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 27 19:52:35 2025 -0800" }, "message": "Re-disable host cross builds for proc_macro2 am: b3af9c5237\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3463635\n\nChange-Id: Ia807268764c01881460b0e5a000a0ebfba528ade\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "b3af9c5237321df174b7b10cfe48f315334bc085", "tree": "f5e2027a82b7ca03136077735be6f74a322e3277", "parents": [ "8dadcb7fe61345cab741493a341a1862f3f203c4" ], "author": { "name": "Chris Wailes", "email": "chriswailes@google.com", "time": "Mon Jan 27 15:50:44 2025 -0800" }, "committer": { "name": "Chris Wailes", "email": "chriswailes@google.com", "time": "Mon Jan 27 16:40:22 2025 -0800" }, "message": "Re-disable host cross builds for proc_macro2\n\nThis CL re-applies the manual edits to the generated Android.bp files\nfor Cronet\u0027s Rust crates necessary to prevent attempts to build\nproc_macro2 as a host cross target.\n\nPrevious changes applied in Ia4e2725875ee60197e28748407cbc49f9bb5f0d3\n\nBug: 392704960\nBug: 374842582\nChange-Id: I7003d6bff92e316de80ebaef16bb4b2819cfb49f\n" }, { "commit": "d5d87c34e649b68418574581fe9d15232d243f9a", "tree": "edc6f3da6e530af1eea0ac605f5862383cdaa5d2", "parents": [ "aa2e6d32fdb848b1f2daeed04ccce852c679ce8f", "8dadcb7fe61345cab741493a341a1862f3f203c4" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jan 27 11:41:05 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 27 11:41:05 2025 -0800" }, "message": "Merge \"Add tracing to some HttpEngine\u0027s method\" into main am: 8dadcb7fe6\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3465297\n\nChange-Id: Ic31b579d7bc0add627d992066c40321beebec51f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8dadcb7fe61345cab741493a341a1862f3f203c4", "tree": "edc6f3da6e530af1eea0ac605f5862383cdaa5d2", "parents": [ "cd24a3f58917fca33bd4358d1314fb89765a8192", "81e20e97483640db82a485af0a56ef418d76b3ce" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jan 27 11:32:29 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jan 27 11:32:29 2025 -0800" }, "message": "Merge \"Add tracing to some HttpEngine\u0027s method\" into main" }, { "commit": "aa2e6d32fdb848b1f2daeed04ccce852c679ce8f", "tree": "ee01e539c48bccd591a7bc8cb2e1370e07591c1f", "parents": [ "c76255ea83af7ade8495d67b4015e82c4794782f", "cd24a3f58917fca33bd4358d1314fb89765a8192" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jan 27 09:59:12 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 27 09:59:12 2025 -0800" }, "message": "Merge \"Add preupload hook to external/cronet\" into main am: cd24a3f589\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3465299\n\nChange-Id: I767bc727d80ed2b405b6e3dc2e2c727578eda88b\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "cd24a3f58917fca33bd4358d1314fb89765a8192", "tree": "ee01e539c48bccd591a7bc8cb2e1370e07591c1f", "parents": [ "169f212be469d26129d4ef8138b0e3690927f787", "dad43d2bb21b7e7ce3d75638051e4b372397aae7" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Mon Jan 27 09:43:05 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Mon Jan 27 09:43:05 2025 -0800" }, "message": "Merge \"Add preupload hook to external/cronet\" into main" }, { "commit": "c76255ea83af7ade8495d67b4015e82c4794782f", "tree": "b59caf0f0b23433a408543e97dcc22bfe33d800b", "parents": [ "8bfe0ad5876bb20bfbb57091f2d3045badb4c1c0", "169f212be469d26129d4ef8138b0e3690927f787" ], "author": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Mon Jan 27 08:51:05 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 27 08:51:05 2025 -0800" }, "message": "Make the include anchor meet Cronet dependencies am: 169f212be4\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3463665\n\nChange-Id: Ie963a609f592e5c46355245fcfb43173ac2f09ab\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "8bfe0ad5876bb20bfbb57091f2d3045badb4c1c0", "tree": "dce5e82070fc4565f583cb81f0d543e0a7577dd8", "parents": [ "e0ce369b0a8571d94da6a5ad207e720d11ad0572", "37452521941ee2d1df0654c08bfd3e78dc28f53d" ], "author": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Mon Jan 27 08:50:57 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 27 08:50:57 2025 -0800" }, "message": "Run bpfmt on Android.extras.bp am: 3745252194\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3465298\n\nChange-Id: I26b1c99396e946db83b8bf911b44e79857cbac49\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "81e20e97483640db82a485af0a56ef418d76b3ce", "tree": "514b3a496210d2df3ae5db64db0c2b804f16fcc2", "parents": [ "dad43d2bb21b7e7ce3d75638051e4b372397aae7" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Mon Jan 27 15:19:19 2025 +0000" }, "committer": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Mon Jan 27 16:45:34 2025 +0000" }, "message": "Add tracing to some HttpEngine\u0027s method\n\nAdded tracing to HttpEngine#Build and HttpEngine#createBuilderDelegate.\n\nThis is needed because once we start preloading the native code in\nthe zygote, we\u0027ll have no way to figuring out where does HttpEngine\nloading code starts / end as there\u0027ll be no indication, also the tracing\nsprinkled in CronetEngine does not distinguish HttpEngine from Cronet.\n\nChange-Id: Ic396ada60a5a722d8c131ab1f9baf09c0f484c8d\n" }, { "commit": "dad43d2bb21b7e7ce3d75638051e4b372397aae7", "tree": "a5581f9efed9d43d3b8e6129f6d89ab8ca34ee67", "parents": [ "82d798758e60751dbeb95641a5ff760fe380e546" ], "author": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Mon Jan 27 15:59:13 2025 +0000" }, "committer": { "name": "Mohannad Farrag", "email": "aymanm@google.com", "time": "Mon Jan 27 16:45:08 2025 +0000" }, "message": "Add preupload hook to external/cronet\n\nThis should standardize the code formatting that is used across the\nentire repository for directories that are not automatically imported\nfrom Chromium (eg: android/, test_runner/).\n\nThe default for java-formatting is the google_java_format --aosp.\nThe default for CPP formatting is clang-format.\nThe default for kotlin is ktfmt.\n\nAdded automatic bpfmt on repo upload.\n\nRemoved the requirement to add \u0027Test:\u0027.\n\nChange-Id: Ia71f2069be0464698231f0d74075316419cd05fc\n" }, { "commit": "169f212be469d26129d4ef8138b0e3690927f787", "tree": "b59caf0f0b23433a408543e97dcc22bfe33d800b", "parents": [ "37452521941ee2d1df0654c08bfd3e78dc28f53d" ], "author": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Mon Jan 27 15:34:50 2025 +0000" }, "committer": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Mon Jan 27 15:42:53 2025 +0000" }, "message": "Make the include anchor meet Cronet dependencies\n\nOtherwise the next Cronet import will fail to build due to various\nconstraints being not met.\n\nTest: TreeHugger\nBug: 392052561\nChange-Id: I0afacac611d21106cedbf2da6c1b70a39f342366\n" }, { "commit": "37452521941ee2d1df0654c08bfd3e78dc28f53d", "tree": "dce5e82070fc4565f583cb81f0d543e0a7577dd8", "parents": [ "82d798758e60751dbeb95641a5ff760fe380e546" ], "author": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Mon Jan 27 15:41:18 2025 +0000" }, "committer": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Mon Jan 27 15:41:18 2025 +0000" }, "message": "Run bpfmt on Android.extras.bp\n\nTest: TreeHugger\nChange-Id: I045159a6e7172171f7d01a4c6e150c78a225adca\n" }, { "commit": "e0ce369b0a8571d94da6a5ad207e720d11ad0572", "tree": "c16df690193bc8d37be0cd28040fc6bb31a06c35", "parents": [ "e786d5ca0b2ad9385d0c6884e1833e98e3aab035", "82d798758e60751dbeb95641a5ff760fe380e546" ], "author": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Mon Jan 27 03:03:52 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Mon Jan 27 03:03:52 2025 -0800" }, "message": "Remove traffic_stats_unittest divergence am: 82d798758e\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3463890\n\nChange-Id: Ic663d819beed1cd7340e1859751dab3f06a2bdbf\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "82d798758e60751dbeb95641a5ff760fe380e546", "tree": "c16df690193bc8d37be0cd28040fc6bb31a06c35", "parents": [ "a5d2feaba818eaf39e77dcf5177ba722582c24be" ], "author": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Fri Jan 24 16:56:54 2025 +0000" }, "committer": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Fri Jan 24 16:56:54 2025 +0000" }, "message": "Remove traffic_stats_unittest divergence\n\nThis was upstreamed as https://crrev.com/c/5923521, but with\nmodifications. This CL backports the upstreamed change so that the\ndivergence will disappear on the next Cronet import, instead of causing\na merge conflict.\n\nTest: TreeHugger\nBug: 392052561\nChange-Id: I3c92523eb5ecc2ceeb932005768ab75fc00c140e\n" }, { "commit": "e786d5ca0b2ad9385d0c6884e1833e98e3aab035", "tree": "cf5831bd392fa77fb440574537869ec6f1b3e635", "parents": [ "5b1dceeb79c43c68f4d5734035a128b951499e4b", "a5d2feaba818eaf39e77dcf5177ba722582c24be" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Jan 24 08:04:21 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 24 08:04:21 2025 -0800" }, "message": "Merge \"Fix binary file in consistency file\" into main am: a5d2feaba8\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3463533\n\nChange-Id: I4d8b5a66342d9ee85ca29328f9c69c57b0c4558f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "a5d2feaba818eaf39e77dcf5177ba722582c24be", "tree": "cf5831bd392fa77fb440574537869ec6f1b3e635", "parents": [ "f063ae5e2b0fc324618c2bfc3d2fc52dfc041f3a", "66567552c0589e79dffd55efdbbc52ffa1cfee92" ], "author": { "name": "Treehugger Robot", "email": "android-test-infra-autosubmit@system.gserviceaccount.com", "time": "Fri Jan 24 07:53:00 2025 -0800" }, "committer": { "name": "Gerrit Code Review", "email": "noreply-gerritcodereview@google.com", "time": "Fri Jan 24 07:53:00 2025 -0800" }, "message": "Merge \"Fix binary file in consistency file\" into main" }, { "commit": "66567552c0589e79dffd55efdbbc52ffa1cfee92", "tree": "cb80899d3d22b11e28442dc49abf668de943c175", "parents": [ "79629cb496122bfeaa54ad6629886600623ce5e5" ], "author": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Fri Jan 24 14:20:53 2025 +0000" }, "committer": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Fri Jan 24 14:20:53 2025 +0000" }, "message": "Fix binary file in consistency file\n\nThis file accidentally made it through https://r.android.com/3463401.\n\nTest: N/A\nBug: 392052561\nBug: 381421702\nBug: 305035334\nChange-Id: Id336e8a26b670b391eb9cb483db7450b5bb15bf9\n" }, { "commit": "5b1dceeb79c43c68f4d5734035a128b951499e4b", "tree": "51cea256daed610badfe8f565fd28edfee87204a", "parents": [ "111e9be9e9e011c31de4203f46749d635c579c2b", "f063ae5e2b0fc324618c2bfc3d2fc52dfc041f3a" ], "author": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Fri Jan 24 05:10:53 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Fri Jan 24 05:10:53 2025 -0800" }, "message": "Delete Cronet AOSP import tools am: f063ae5e2b\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3464267\n\nChange-Id: Ib66a81b9a18c5c832aff4b7988d2457f0962992f\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "f063ae5e2b0fc324618c2bfc3d2fc52dfc041f3a", "tree": "51cea256daed610badfe8f565fd28edfee87204a", "parents": [ "79629cb496122bfeaa54ad6629886600623ce5e5" ], "author": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Fri Jan 24 10:42:52 2025 +0000" }, "committer": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Fri Jan 24 10:42:52 2025 +0000" }, "message": "Delete Cronet AOSP import tools\n\nThese are now maintained on the Chromium side. Get rid of the\nAOSP versions as they are obsolete and hopelessly broken now.\n\nTest: N/A\nBug: 381421702\nChange-Id: If819e7b739f3e79d0ef91a95bc979a19f29587f3\n" }, { "commit": "111e9be9e9e011c31de4203f46749d635c579c2b", "tree": "d41e9cc6dc093d8675166bb9418b8e0080570ed4", "parents": [ "ee092f7fb79cc4e217912d9becb68aa3da8bb8ab", "79629cb496122bfeaa54ad6629886600623ce5e5" ], "author": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Thu Jan 23 10:51:12 2025 -0800" }, "committer": { "name": "Automerger Merge Worker", "email": "android-build-automerger-merge-worker@system.gserviceaccount.com", "time": "Thu Jan 23 10:51:12 2025 -0800" }, "message": "Import Cronet 131.0.6738.0 into AOSP am: 79629cb496\n\nOriginal change: https://android-review.googlesource.com/c/platform/external/cronet/+/3463401\n\nChange-Id: Ide02ee8fd6916e92cbb5584952e5232c99ed08c4\nSigned-off-by: Automerger Merge Worker \u003candroid-build-automerger-merge-worker@system.gserviceaccount.com\u003e\n" }, { "commit": "79629cb496122bfeaa54ad6629886600623ce5e5", "tree": "d41e9cc6dc093d8675166bb9418b8e0080570ed4", "parents": [ "ec01ef08ec55e7cb9364e49a4c80102559d5b186" ], "author": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Wed Jan 22 14:53:15 2025 +0000" }, "committer": { "name": "Etienne Dechamps", "email": "edechamps@google.com", "time": "Thu Jan 23 16:43:30 2025 +0000" }, "message": "Import Cronet 131.0.6738.0 into AOSP\n\nThis commit brings in Cronet from Chromium 131.0.6738.0 (plus cherry-picks) into\nAOSP, along with a few manual changes on top to make it work.\n\nNote this commit was produced using a brand new kind of import workflow, which\nis very different from previous imports. Most notably:\n\n - The gn2bp process is now driven from the Chromium side instead of the AOSP\n side\n - The 3-way merge is driven by copybara instead of merging across AOSP\n upstream-import and upstream-staging git branches (which are now de facto\n deprecated)\n\nWHAT THIS COMMIT CONTAINS\n\nThe code in this commit was imported from:\n\n https://chromium.googlesource.com/experimental/chromium/src/+/refs/wip/cronet/aosp-131.0.6738.0\n Commit SHA: adfbec5f02e29d58e8ee246f0eaa6b62efa2b3b9\n\nThis commit is a descendant of Chromium src tag 131.0.6738.0 (369c6304), with\nthe following commits added on top:\n\n - 72 commits which are backported from the Chromium src main branch;\n - 2 commits that are not yet on the Chromium src main branch, but will be soon;\n - 4 commits that are specific to 131.0.6738.0 and are not going to be submitted\n to the Chromium src main branch.\n\nOn top of the imported code, various manual adjustments have been made to make\nthe code work:\n\n - Resolution of 3-way merge conflicts caused by divergence of the AOSP code\n relative to the Chromium code\n - Making various methods public to resolve package-private visibility issues,\n which only arise due to the use of jarjar in AOSP\n - Add cronet_aml_net_android_dummy_spnego_authenticator_java__testing to\n cronet_for_testing_net_java, otherwise\n net::HttpAuthHandlerNegotiateTest::SetUp crashes (see also\n https://crrev.com/c/6182156)\n\nHOW TO REPRODUCE THIS COMMIT\n\nThe contents of this commit (minus the manual adjustments) can be reproduced by\nrunning:\n\n gclient config --spec \u0027solutions \u003d [\n {\n \"name\": \"src\",\n \"url\": \"https://chromium.googlesource.com/experimental/chromium/src.git\",\n \"managed\": False,\n \"custom_deps\": {},\n \"custom_vars\": {\n \"checkout_copybara\": True,\n },\n },\n ]\n target_os \u003d [\"android\"]\n \u0027 \u0026\u0026\n gclient sync --rev\u003drefs/wip/cronet/aosp-131.0.6738.0 --shallow \u0026\u0026\n cd src \u0026\u0026\n vpython3 components/cronet/gn2bp/run_gn2bp.py\n\nWhen running this command on top of this commit, the result is expected to be an\nempty diff.\n\nTest: TreeHugger\nFixes: 381421702\nChange-Id: I8cb75517759f8d16923c9be48835cd0f2f6722b3\n" } ], "next": "ee092f7fb79cc4e217912d9becb68aa3da8bb8ab" }