@@ -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,10 @@ 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
@@ -208,42 +214,67 @@ function pick_unmerged_commits {
208214 # 2023-06-05
209215 repopick -f -t Q_asb_2023-06 || exit 1
210216 # 2023-07-05
211- repopick -Q " topic:Q_asb_2023-07+NOT+362202" || exit 1
217+ repopick -f 362202 || exit 1
218+ cp -v ./android/default.xml ./.repo/manifests || exit 1
219+ repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast tools/apksig 2>&1 || exit 1
220+ repopick -f -t Q_asb_2023-07 || exit 1
212221 # 2023-08-05
213- repopick -Q " topic:Q_asb_2023-08+NOT+365443" || exit 1
222+ repopick -f 365443 || exit 1
223+ cp -v ./android/default.xml ./.repo/manifests || exit 1
224+ repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast system/ca-certificates 2>&1 || exit 1
225+ repopick -f 378097 || exit 1
226+ repopick -f -t Q_asb_2023-08 || exit 1
214227 # 2023-09-05
215228 repopick -f -t Q_asb_2023-09 || exit 1
216229 # 2023-10-05
230+ repopick -f 376554 || exit 1
231+ cp -v ./android/default.xml ./.repo/manifests/ || exit 1
232+ repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/libxml2 2>&1 || exit 1
217233 repopick -f -t Q_asb_2023-10 || exit 1
234+ # 2023-11-05
235+ repopick -f 376556 || exit 1
236+ cp -v ./android/default.xml ./.repo/manifests/ || exit 1
237+ repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/webp || exit 1
238+ repopick -f -t prp-Q-for-CVE-2023-4863 || exit 1
239+ repopick -f -t CVE-2023-4863 || exit 1
240+ repopick -f 376555 || exit 1
241+ cp -v ./android/default.xml ./.repo/manifests/ || exit 1
242+ repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 external/libcups || exit 1
243+ repopick -f -t Q_asb_2023-11 || exit 1
244+ # 2023-12-05
245+ repopick -f 377251 || exit 1
246+ cp -v ./android/default.xml ./.repo/manifests || exit 1
247+ repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast external/pdfium 2>&1 || exit 1
248+ repopick -f -t Q_asb_2023-12 || exit 1
218249 echo
219250 fi
220251 if [ " ${rev} " == " 18.1" ]; then
221252 echo
222- # 2023-11 -05
223- repopick -f 373945 || exit 1
253+ # 2023-12 -05
254+ repopick -f 376996 || exit 1
224255 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
256+ repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 cts external/pdfium || exit 1
257+ repopick -t R_asb_2023-12 || exit 1
227258 echo
228259 fi
229260 if [ " ${rev} " == " 19.1" ]; then
230261 echo
231- # 2023-11 -05
232- repopick -f 373879 || exit 1
262+ # 2023-12 -05
263+ repopick -f 376774 || exit 1
233264 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
265+ repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 cts external/pdfium system/netd || exit 1
266+ repopick -t S_asb_2023-12 || exit 1
236267 echo
237268 fi
238269 if [ " ${rev} " == " 20.0" ]; then
239270 echo
240- # 2023-11 -05
241- repopick -f 373310 || exit 1
271+ # 2023-12 -05
272+ repopick -f 376247 || exit 1
242273 cp -v ./android/default.xml ./.repo/manifests/ || exit 1
243274 cp -v ./android/snippets/lineage.xml ./.repo/manifests/snippets/ || exit 1
244275 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
276+ repo sync -v -j 1 -c --no-tags --no-clone-bundle --force-sync --fail-fast 2>&1 cts external/pdfium || exit 1
277+ repopick -p -t T_asb_2023-12 || exit 1
247278 echo
248279 fi
249280 return 0
0 commit comments