| commit | e4c4755100a76a9806476f15c94b88de7859490c | [log] [tgz] |
|---|---|---|
| author | Copybara <noreply@copybara.io> | Wed Mar 19 06:08:18 2025 +0000 |
| committer | Etienne Dechamps <edechamps@google.com> | Tue Mar 25 16:39:24 2025 +0000 |
| tree | a0200ec153ff38b1f47387bad84cc2a0e8ca792f | |
| parent | 994e4b77aa1aeac8ddc686a224180fc486cd7bce [diff] |
Import 18th Mar 2025 ToT Cronet from Chromium to AOSP Generated by Copybara via Chromium's ci/android-cronet-arm64-gn2bp-dbg: https://ci.chromium.org/ui/p/chromium/builders/ci/android-cronet-arm64-gn2bp-dbg/7609/overview. Then updated to include a cherry-pick of https://chromium-review.googlesource.com/c/chromium/src/+/6383356. These can also be seen from the branch representing this import: https://chromium.googlesource.com/experimental/chromium/src/+/refs/wip/cronet/aosp-tot_import_mar_18_25. With commit SHA: 3e3cc0341bdf13d1c6593a9f206eaf7f13c463e1. This commit can be reproduced by running: $ gclient config --spec 'solutions = [ { "name": "src", "url": "https://chromium.googlesource.com/experimental/chromium/src.git", "managed": False, "custom_deps": {}, "custom_vars": { "checkout_copybara": True, }, }, ] target_os = ["android"] ' && gclient sync --rev=refs/wip/cronet/aosp-tot_import_mar_18_25 --shallow && cd src && vpython3 components/cronet/gn2bp/run_gn2bp.py Additionally, manual tweaks have been applied after patchset 1. These are required to: 1. Fix naming in non-versioned/templated top-level Android.bp 2. Resolve merge conflicts 3. Update consistency files with changes (1) and (2) Bug: b:403544010 FolderOrigin-RevId: /b/s/w/ir/cache/builder/src Change-Id: I15308a1c82a99a6d850bfb0ed37dbbf91439b9ea
