diff options
| author | Chidera Olibie <colibie@google.com> | 2024-03-05 16:33:48 +0000 |
|---|---|---|
| committer | Chidera Olibie <colibie@google.com> | 2024-03-07 11:02:35 +0000 |
| commit | d3e59c829dd8047b3eabb974a28a8bc7cb4fdf5a (patch) | |
| tree | df79120688beecb6953bd77a711cee44a621a676 | |
| parent | b704a8d322a44f282daf88e551bbff987116a35d (diff) | |
| download | cronet-upstream-staging.tar.gz | |
Cronet 121_0_6167_71: Update cherrypick list for gn_descupstream-staging
These cherrypicks are necessary for an update to work.
The desc_*.json files were unchanged after running the script.
Bug: b/322154153
Change-Id: I51bbeb5535cdf9385791b77cabb598a64ef68317
| -rwxr-xr-x | android/tools/gn2bp/gen_desc_json.sh | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/android/tools/gn2bp/gen_desc_json.sh b/android/tools/gn2bp/gen_desc_json.sh index eff849554..0351fde0d 100755 --- a/android/tools/gn2bp/gen_desc_json.sh +++ b/android/tools/gn2bp/gen_desc_json.sh @@ -73,10 +73,6 @@ function setup_chromium_src_repo() ( ####################################### function cherry_pick_chromium_cls() ( cd "${chromium_dir}" - # Remove once 121.0.6131.0 is imported - git fetch https://chromium.googlesource.com/chromium/src refs/changes/25/5033625/2 && git cherry-pick FETCH_HEAD - # Remove once 121.0.6160.0 is imported - git fetch https://chromium.googlesource.com/chromium/src refs/changes/01/5075001/2 && git cherry-pick FETCH_HEAD # Remove once 122.0.6168.0 is imported git fetch https://chromium.googlesource.com/chromium/src refs/changes/32/5083632/4 && git cherry-pick FETCH_HEAD git fetch https://chromium.googlesource.com/chromium/src refs/changes/14/5094514/5 && git cherry-pick FETCH_HEAD @@ -86,6 +82,12 @@ function cherry_pick_chromium_cls() ( git fetch https://chromium.googlesource.com/chromium/src refs/changes/35/5184435/4 && git cherry-pick FETCH_HEAD # Remove once 123.0.6272.0 is imported git fetch https://chromium.googlesource.com/chromium/src refs/changes/93/5164293/3 && git cherry-pick FETCH_HEAD + # Remove once 123.0.6286.0 is imported + git fetch https://chromium.googlesource.com/chromium/src refs/changes/42/5259242/5 && git cherry-pick FETCH_HEAD + # Remove once 124.0.6317.0 is imported + git fetch https://chromium.googlesource.com/chromium/src refs/changes/51/5317651/2 && git cherry-pick FETCH_HEAD + # Remove once 124.0.6340.0 is imported + git fetch https://chromium.googlesource.com/chromium/src refs/changes/79/5340179/4 && git cherry-pick FETCH_HEAD ) ####################################### # Generate desc.json for a specified architecture. |