Skip to content

Commit cb233f5

Browse files
committed
Add December security patches
1 parent 8925375 commit cb233f5

1 file changed

Lines changed: 25 additions & 15 deletions

File tree

laos_build.sh

Lines changed: 25 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,8 @@ function pick_unmerged_commits {
167167
repopick -f -t n-asb-2024-10 || exit 1
168168
#2024-11-05
169169
repopick -f -t n-asb-2024-11 || exit 1
170+
#2024-12-05
171+
repopick -f -t n-asb-2024-12 || exit 1
170172
#tzdb_N
171173
repopick -f -t tzdb_N || exit 1
172174
echo
@@ -252,6 +254,8 @@ function pick_unmerged_commits {
252254
repopick -f -t P_asb_2024-10 || exit 1
253255
#2024-11-05
254256
repopick -f -t P_asb_2024-11 || exit 1
257+
#2024-12-05
258+
repopick -f -t P_asb_2024-12 || exit 1
255259
echo
256260
fi
257261
if [ "${rev}" == "17.1" ]; then
@@ -321,6 +325,10 @@ function pick_unmerged_commits {
321325
repopick -f -t Q_asb_2024-09 || exit 1
322326
#2024-10-05
323327
repopick -f -t Q_asb_2024-10 || exit 1
328+
#2024-11-05
329+
repopick -f -t Q_asb_2024-11 || exit 1
330+
#2024-12-05
331+
repopick -f -t Q_asb_2024-12 || exit 1
324332
echo
325333
fi
326334
if [ "${rev}" == "18.1" ]; then
@@ -352,33 +360,35 @@ function pick_unmerged_commits {
352360
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
353361
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/skia || exit 1
354362
repopick -t R_asb_2024-11 || exit 1
363+
#2024-12-05
364+
repopick -t R_asb_2024-12 || exit 1
355365
echo
356366
fi
357367
if [ "${rev}" == "19.1" ]; then
358368
echo
359-
#2024-11-05
360-
repopick -f 408151 || exit 1
361-
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
362-
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/skia || exit 1
363-
repopick -t S_asb_2024-11 || exit 1
369+
#2024-12-05
370+
# repopick -f 408151 || exit 1
371+
# cp -v ./android/default.xml ./.repo/manifests/ || exit 1
372+
# repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/skia || exit 1
373+
repopick -t S_asb_2024-12 || exit 1
364374
echo
365375
fi
366376
if [ "${rev}" == "20.0" ]; then
367377
echo
368-
#2024-11-05
369-
repopick -f 408122 || exit 1
370-
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
371-
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/skia || exit 1
372-
repopick -p -t T_asb_2024-11 || exit 1
378+
#2024-12-05
379+
# repopick -f 408122 || exit 1
380+
# cp -v ./android/default.xml ./.repo/manifests/ || exit 1
381+
# repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/skia || exit 1
382+
repopick -p -t T_asb_2024-12 || exit 1
373383
echo
374384
fi
375385
if [ "${rev}" == "21.0" ]; then
376386
echo
377-
#2024-11-05
378-
repopick -f 407834 || exit 1
379-
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
380-
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/skia system/keymint || exit 1
381-
repopick -p -t U_asb_2024-11 || exit 1
387+
#2024-12-05
388+
# repopick -f 407834 || exit 1
389+
# cp -v ./android/default.xml ./.repo/manifests/ || exit 1
390+
# repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/skia system/keymint || exit 1
391+
repopick -p -t U_asb_2024-12 || exit 1
382392
echo
383393
fi
384394
return 0

0 commit comments

Comments
 (0)