@@ -185,6 +185,8 @@ function pick_unmerged_commits {
185185 repopick -f -t n-asb-2025-03 || exit 1
186186 # 2025-04-05
187187 repopick -f -t n-asb-2025-04 || exit 1
188+ # 2025-05-05
189+ repopick -f -t n-asb-2025-05 || exit 1
188190 # tzdb_N
189191 repopick -f -t tzdb_N || exit 1
190192 echo
@@ -370,6 +372,8 @@ function pick_unmerged_commits {
370372 repopick -t Q_asb_2025-03 || exit 1
371373 # 2025-04-05
372374 repopick -t Q_asb_2025-04 || exit 1
375+ # 2025-05-05
376+ repopick -t Q_asb_2025-05 || exit 1
373377 echo
374378 fi
375379 if [ " ${rev} " == " 18.1" ]; then
@@ -417,6 +421,11 @@ function pick_unmerged_commits {
417421 repopick -t R_asb_2025-03 || exit 1
418422 # 2025-04-05
419423 repopick -t R_asb_2025-04 || exit 1
424+ # 2025-05-05
425+ repopick -f 392208 || exit 1
426+ cp -v ./android/default.xml ./.repo/manifests/ || exit 1
427+ repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/sonivox || exit 1
428+ repopick -t R_asb_2025-05 || exit 1
420429 echo
421430 fi
422431 if [ " ${rev} " == " 19.1" ]; then
@@ -428,35 +437,37 @@ function pick_unmerged_commits {
428437 repopick -t S_asb_2025-03 || exit 1
429438 # 2025-04-05
430439 repopick -t S_asb_2025-04 || exit 1
440+ # 2025-05-05
441+ repopick -t S_asb_2025-05 || exit 1
431442 echo
432443 fi
433444 if [ " ${rev} " == " 20.0" ]; then
434445 echo
435- # 2025-04 -05
436- repopick -f 428045 || exit 1
446+ # 2025-05 -05
447+ repopick -f 430761 || exit 1
437448 cp -v ./android/default.xml ./.repo/manifests/ || exit 1
438- repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 packages/modules/IntentResolver || exit 1
439- repopick -p -t T_asb_2025-04 || exit 1
449+ repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/freetype || exit 1
450+ repopick -p -t T_asb_2025-05 || exit 1
440451 echo
441452 fi
442453 if [ " ${rev} " == " 21.0" ]; then
443454 echo
444- # 2025-04 -05
455+ # 2025-05 -05
445456 # repopick -f 420932 || exit 1
446457 # cp -v ./android/default.xml ./.repo/manifests/ || exit 1
447458 # repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/dng_sdk || exit 1
448- repopick -p -t U_asb_2025-04 || exit 1
459+ repopick -p -t U_asb_2025-05 || exit 1
449460 echo
450461 fi
451462 if [ " ${rev} " == " 22.2" ]; then
452463 echo
453- # 2025-04 -05
454- # repopick -f 417621 || exit 1
455- # cp -v ./android/default.xml ./.repo/manifests/ || exit 1
456- # cp -v ./android/snippets/pixel.xml ./.repo/manifests/snippets/ || exit 1
457- # repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 || exit 1
458- repopick -p -t V_asb_2025-04 || exit 1
459- repopick -p -t V_asb_2025-04_pixel || exit 1
464+ # 2025-05 -05
465+ repopick -f 430342 || exit 1
466+ cp -v ./android/default.xml ./.repo/manifests/ || exit 1
467+ cp -v ./android/snippets/pixel.xml ./.repo/manifests/snippets/ || exit 1
468+ repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 || exit 1
469+ repopick -p -t V_asb_2025-05 || exit 1
470+ repopick -p -t V_asb_2025-05_pixel || exit 1
460471 echo
461472 fi
462473 return 0
0 commit comments