Skip to content

Commit 8925375

Browse files
committed
Add November security patches
1 parent 44ef0b7 commit 8925375

1 file changed

Lines changed: 25 additions & 14 deletions

File tree

laos_build.sh

Lines changed: 25 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -165,6 +165,8 @@ function pick_unmerged_commits {
165165
repopick -f -t n-asb-2024-09 || exit 1
166166
#2024-10-05
167167
repopick -f -t n-asb-2024-10 || exit 1
168+
#2024-11-05
169+
repopick -f -t n-asb-2024-11 || exit 1
168170
#tzdb_N
169171
repopick -f -t tzdb_N || exit 1
170172
echo
@@ -248,6 +250,8 @@ function pick_unmerged_commits {
248250
repopick -f -t P_asb_2024-09 || exit 1
249251
#2024-10-05
250252
repopick -f -t P_asb_2024-10 || exit 1
253+
#2024-11-05
254+
repopick -f -t P_asb_2024-11 || exit 1
251255
echo
252256
fi
253257
if [ "${rev}" == "17.1" ]; then
@@ -315,6 +319,8 @@ function pick_unmerged_commits {
315319
repopick -f -t Q_asb_2024-08 || exit 1
316320
#2024-09-05
317321
repopick -f -t Q_asb_2024-09 || exit 1
322+
#2024-10-05
323+
repopick -f -t Q_asb_2024-10 || exit 1
318324
echo
319325
fi
320326
if [ "${rev}" == "18.1" ]; then
@@ -341,33 +347,38 @@ function pick_unmerged_commits {
341347
repopick -t R_asb_2024-09 || exit 1
342348
#2024-10-05
343349
repopick -t R_asb_2024-10 || exit 1
350+
#2024-11-05
351+
repopick -f 408436 || exit 1
352+
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
353+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/skia || exit 1
354+
repopick -t R_asb_2024-11 || exit 1
344355
echo
345356
fi
346357
if [ "${rev}" == "19.1" ]; then
347358
echo
348-
#2024-10-05
349-
# repopick -f 394523 || exit 1
350-
# cp -v ./android/default.xml ./.repo/manifests/ || exit 1
351-
# repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 system/libfmq || exit 1
352-
repopick -t S_asb_2024-10 || exit 1
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
353364
echo
354365
fi
355366
if [ "${rev}" == "20.0" ]; then
356367
echo
357-
#2024-10-05
358-
# repopick -f 394238 || exit 1
359-
# cp -v ./android/default.xml ./.repo/manifests/ || exit 1
360-
# repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 system/libfmq || exit 1
361-
repopick -p -t T_asb_2024-10 || exit 1
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
362373
echo
363374
fi
364375
if [ "${rev}" == "21.0" ]; then
365376
echo
366-
#2024-10-05
367-
repopick -f 405182 || exit 1
377+
#2024-11-05
378+
repopick -f 407834 || exit 1
368379
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
369-
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 build/release libcore packages/modules/IntentResolver || exit 1
370-
repopick -p -t U_asb_2024-10 || 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
371382
echo
372383
fi
373384
return 0

0 commit comments

Comments
 (0)