Skip to content

Commit 718afb6

Browse files
committed
December scurity patches
Also some fixes for los 17.1
1 parent 9de646d commit 718afb6

File tree

1 file changed

+37
-14
lines changed

1 file changed

+37
-14
lines changed

laos_build.sh

Lines changed: 37 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -133,6 +133,8 @@ function pick_unmerged_commits {
133133
repopick -f -t n-asb-2023-10 || exit 1
134134
#2023-11-05
135135
repopick -f -t n-asb-2023-11 || exit 1
136+
#2023-12-05
137+
repopick -f -t n-asb-2023-12 || exit 1
136138
#tzdb2021c_N
137139
repopick -f -t tzdb_N || exit 1
138140
echo
@@ -192,6 +194,8 @@ function pick_unmerged_commits {
192194
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
193195
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/libxml2 || exit 1
194196
repopick -f -t P_asb_2023-10 || exit 1
197+
#2023-11-05
198+
repopick -f -t P_asb_2023-11 || exit 1
195199
echo
196200
fi
197201
if [ "${rev}" == "17.1" ]; then
@@ -208,42 +212,61 @@ function pick_unmerged_commits {
208212
#2023-06-05
209213
repopick -f -t Q_asb_2023-06 || exit 1
210214
#2023-07-05
211-
repopick -Q "topic:Q_asb_2023-07+NOT+362202" || exit 1
215+
repopick -f 362202 || exit 1
216+
cp -v ./android/default.xml ./.repo/manifests || exit 1
217+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast tools/apksig 2>&1 || exit 1
218+
repopick -f -t Q_asb_2023-07 || exit 1
212219
#2023-08-05
213-
repopick -Q "topic:Q_asb_2023-08+NOT+365443" || exit 1
220+
repopick -f 365443 || exit 1
221+
cp -v ./android/default.xml ./.repo/manifests || exit 1
222+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast system/ca-certificates 2>&1 || exit 1
223+
repopick -f -t Q_asb_2023-08 || exit 1
214224
#2023-09-05
215225
repopick -f -t Q_asb_2023-09 || exit 1
216226
#2023-10-05
227+
repopick -f 376554 || exit 1
228+
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
229+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/libxml2 2>&1 || exit 1
217230
repopick -f -t Q_asb_2023-10 || exit 1
231+
#2023-11-05
232+
repopick -f 376556 || exit 1
233+
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
234+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/webp || exit 1
235+
repopick -f -t prp-Q-for-CVE-2023-4863 || exit 1
236+
repopick -f -t CVE-2023-4863 || exit 1
237+
repopick -f 376555 || exit 1
238+
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
239+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/libcups || exit 1
240+
repopick -f -t Q_asb_2023-11 || exit 1
218241
echo
219242
fi
220243
if [ "${rev}" == "18.1" ]; then
221244
echo
222-
#2023-11-05
223-
repopick -f 373945 || exit 1
245+
#2023-12-05
246+
repopick -f 376996 || exit 1
224247
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
225-
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/libcups || exit 1
226-
repopick -t R_asb_2023-11 || exit 1
248+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 cts external/pdfium || exit 1
249+
repopick -t R_asb_2023-12 || exit 1
227250
echo
228251
fi
229252
if [ "${rev}" == "19.1" ]; then
230253
echo
231-
#2023-11-05
232-
repopick -f 373879 || exit 1
254+
#2023-12-05
255+
repopick -f 376774 || exit 1
233256
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
234-
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 packages/modules/DnsResolver packages/modules/StatsD|| exit 1
235-
repopick -t S_asb_2023-11 || exit 1
257+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 cts external/pdfium system/netd || exit 1
258+
repopick -t S_asb_2023-12 || exit 1
236259
echo
237260
fi
238261
if [ "${rev}" == "20.0" ]; then
239262
echo
240-
#2023-11-05
241-
repopick -f 373310 || exit 1
263+
#2023-12-05
264+
repopick -f 376247 || exit 1
242265
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
243266
cp -v ./android/snippets/lineage.xml ./.repo/manifests/snippets/ || exit 1
244267
cp -v ./android/snippets/pixel.xml ./.repo/manifests/snippets/ || exit 1
245-
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 packages/modules/DnsResolver packages/modules/StatsD system/ca-certificates || exit 1
246-
repopick -p -t T_asb_2023-11 || exit 1
268+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 cts external/pdfium || exit 1
269+
repopick -p -t T_asb_2023-12 || exit 1
247270
echo
248271
fi
249272
return 0

0 commit comments

Comments
 (0)