Skip to content

Commit 72db48d

Browse files
committed
Add December security patches
1 parent 8925375 commit 72db48d

1 file changed

Lines changed: 23 additions & 15 deletions

File tree

laos_build.sh

Lines changed: 23 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,8 @@ 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
324330
echo
325331
fi
326332
if [ "${rev}" == "18.1" ]; then
@@ -352,33 +358,35 @@ function pick_unmerged_commits {
352358
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
353359
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/skia || exit 1
354360
repopick -t R_asb_2024-11 || exit 1
361+
#2024-12-05
362+
repopick -t R_asb_2024-12 || exit 1
355363
echo
356364
fi
357365
if [ "${rev}" == "19.1" ]; then
358366
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
367+
#2024-12-05
368+
# repopick -f 408151 || exit 1
369+
# cp -v ./android/default.xml ./.repo/manifests/ || exit 1
370+
# repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/skia || exit 1
371+
repopick -t S_asb_2024-12 || exit 1
364372
echo
365373
fi
366374
if [ "${rev}" == "20.0" ]; then
367375
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
376+
#2024-12-05
377+
# repopick -f 408122 || exit 1
378+
# cp -v ./android/default.xml ./.repo/manifests/ || exit 1
379+
# repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/skia || exit 1
380+
repopick -p -t T_asb_2024-12 || exit 1
373381
echo
374382
fi
375383
if [ "${rev}" == "21.0" ]; then
376384
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
385+
#2024-12-05
386+
# repopick -f 407834 || exit 1
387+
# cp -v ./android/default.xml ./.repo/manifests/ || exit 1
388+
# repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/skia system/keymint || exit 1
389+
repopick -p -t U_asb_2024-12 || exit 1
382390
echo
383391
fi
384392
return 0

0 commit comments

Comments
 (0)