Skip to content

Commit 64b72ec

Browse files
committed
March security patches
1 parent db2e783 commit 64b72ec

1 file changed

Lines changed: 29 additions & 15 deletions

File tree

laos_build.sh

Lines changed: 29 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,8 @@ function pick_unmerged_commits {
181181
repopick -f -t n-asb-2025-01 || exit 1
182182
#2025-02-05
183183
repopick -f -t n-asb-2025-02 || exit 1
184+
#2025-03-05
185+
repopick -f -t n-asb-2025-03 || exit 1
184186
#tzdb_N
185187
repopick -f -t tzdb_N || exit 1
186188
echo
@@ -275,6 +277,8 @@ function pick_unmerged_commits {
275277
repopick -f -t P_asb_2025-01 || exit 1
276278
#2025-02-05
277279
repopick -f -t P_asb_2025-02 || exit 1
280+
#2025-03-05
281+
repopick -f -t P_asb_2025-03 || exit 1
278282
echo
279283
fi
280284
if [ "${rev}" == "17.1" ]; then
@@ -355,6 +359,11 @@ function pick_unmerged_commits {
355359
repopick -f -t Q_asb_2025-01 || exit 1
356360
#2025-02-05
357361
repopick -t Q_asb_2025-02 || exit 1
362+
#2025-03-05
363+
repopick -f 421785 || exit 1
364+
cp -v ./android/default.xml ./.repo/manifests || exit 1
365+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast external/dng_sdk 2>&1 || exit 1
366+
repopick -t Q_asb_2025-03 || exit 1
358367
echo
359368
fi
360369
if [ "${rev}" == "18.1" ]; then
@@ -395,33 +404,38 @@ function pick_unmerged_commits {
395404
repopick -t R_asb_2025-01 || exit 1
396405
#2025-02-05
397406
repopick -t R_asb_2025-02 || exit 1
407+
#2025-03-05
408+
repopick -f 421145 || exit 1
409+
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
410+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/dng_sdk || exit 1
411+
repopick -t R_asb_2025-03 || exit 1
398412
echo
399413
fi
400414
if [ "${rev}" == "19.1" ]; then
401415
echo
402-
#2025-02-05
403-
# repopick -f 414570 || exit 1
404-
# cp -v ./android/default.xml ./.repo/manifests/ || exit 1
405-
# repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/giflib || exit 1
406-
repopick -t S_asb_2025-02 || exit 1
416+
#2025-03-05
417+
repopick -f 421059 || exit 1
418+
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
419+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/dng_sdk || exit 1
420+
repopick -t S_asb_2025-03 || exit 1
407421
echo
408422
fi
409423
if [ "${rev}" == "20.0" ]; then
410424
echo
411-
#2025-02-05
412-
# repopick -f 414554 || exit 1
413-
# cp -v ./android/default.xml ./.repo/manifests/ || exit 1
414-
# repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/giflib || exit 1
415-
repopick -p -t T_asb_2025-02 || exit 1
425+
#2025-03-05
426+
repopick -f 421011 || exit 1
427+
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
428+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/dng_sdk || exit 1
429+
repopick -p -t T_asb_2025-03 || exit 1
416430
echo
417431
fi
418432
if [ "${rev}" == "21.0" ]; then
419433
echo
420-
#2025-02-05
421-
# repopick -f 414871 || exit 1
422-
# cp -v ./android/default.xml ./.repo/manifests/ || exit 1
423-
# repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/giflib || exit 1
424-
repopick -p -t U_asb_2025-02 || exit 1
434+
#2025-03-05
435+
repopick -f 420932 || exit 1
436+
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
437+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/dng_sdk || exit 1
438+
repopick -p -t U_asb_2025-03 || exit 1
425439
echo
426440
fi
427441
return 0

0 commit comments

Comments
 (0)