Skip to content

Commit 376ea37

Browse files
gothicVIgothicVI
committed
December scurity patches
Also some fixes for los 17.1
1 parent 9de646d commit 376ea37

1 file changed

Lines changed: 46 additions & 14 deletions

File tree

‎laos_build.sh‎

Lines changed: 46 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,10 +194,16 @@ 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
199+
#2023-12-05
200+
repopick -f -t P_asb_2023-12 || exit 1
195201
echo
196202
fi
197203
if [ "${rev}" == "17.1" ]; then
198204
echo
205+
# Fix repopick
206+
repopick -f 378458 || exit 1
199207
#2023-03-05
200208
repopick -f 352333 || exit 1
201209
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
@@ -208,42 +216,66 @@ function pick_unmerged_commits {
208216
#2023-06-05
209217
repopick -f -t Q_asb_2023-06 || exit 1
210218
#2023-07-05
211-
repopick -Q "topic:Q_asb_2023-07+NOT+362202" || exit 1
219+
repopick -f 362202 || exit 1
220+
cp -v ./android/default.xml ./.repo/manifests || exit 1
221+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast tools/apksig 2>&1 || exit 1
222+
repopick -f -t Q_asb_2023-07 || exit 1
212223
#2023-08-05
213-
repopick -Q "topic:Q_asb_2023-08+NOT+365443" || exit 1
224+
repopick -f 365443 || exit 1
225+
cp -v ./android/default.xml ./.repo/manifests || exit 1
226+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast system/ca-certificates 2>&1 || exit 1
227+
repopick -f -t Q_asb_2023-08 || exit 1
214228
#2023-09-05
215229
repopick -f -t Q_asb_2023-09 || exit 1
216230
#2023-10-05
231+
repopick -f 376554 || exit 1
232+
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
233+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/libxml2 2>&1 || exit 1
217234
repopick -f -t Q_asb_2023-10 || exit 1
235+
#2023-11-05
236+
repopick -f 376556 || exit 1
237+
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
238+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/webp || exit 1
239+
repopick -f -t prp-Q-for-CVE-2023-4863 || exit 1
240+
repopick -f -t CVE-2023-4863 || exit 1
241+
repopick -f 376555 || exit 1
242+
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
243+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/libcups || exit 1
244+
repopick -f -t Q_asb_2023-11 || exit 1
245+
#2023-12-05
246+
repopick -f 377251 || exit 1
247+
cp -v ./android/default.xml ./.repo/manifests || exit 1
248+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast external/pdfium 2>&1 || exit 1
249+
repopick -f -t Q_asb_2023-12 || exit 1
218250
echo
219251
fi
220252
if [ "${rev}" == "18.1" ]; then
221253
echo
222-
#2023-11-05
223-
repopick -f 373945 || exit 1
254+
#2023-12-05
255+
repopick -f 376996 || exit 1
224256
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
257+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 cts external/pdfium || exit 1
258+
repopick -t R_asb_2023-12 || exit 1
227259
echo
228260
fi
229261
if [ "${rev}" == "19.1" ]; then
230262
echo
231-
#2023-11-05
232-
repopick -f 373879 || exit 1
263+
#2023-12-05
264+
repopick -f 376774 || exit 1
233265
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
266+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 cts external/pdfium system/netd || exit 1
267+
repopick -t S_asb_2023-12 || exit 1
236268
echo
237269
fi
238270
if [ "${rev}" == "20.0" ]; then
239271
echo
240-
#2023-11-05
241-
repopick -f 373310 || exit 1
272+
#2023-12-05
273+
repopick -f 376247 || exit 1
242274
cp -v ./android/default.xml ./.repo/manifests/ || exit 1
243275
cp -v ./android/snippets/lineage.xml ./.repo/manifests/snippets/ || exit 1
244276
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
277+
repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 cts external/pdfium || exit 1
278+
repopick -p -t T_asb_2023-12 || exit 1
247279
echo
248280
fi
249281
return 0

0 commit comments

Comments
 (0)