diff --git a/Scripts/LineageOS-17.1/Functions.sh b/Scripts/LineageOS-17.1/Functions.sh index 133c8d5e..d583cb54 100644 --- a/Scripts/LineageOS-17.1/Functions.sh +++ b/Scripts/LineageOS-17.1/Functions.sh @@ -78,18 +78,20 @@ patchWorkspaceReal() { gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview"; source build/envsetup.sh; - repipick -i 378458; #repopick: Fix apply order of dependent commits + repopick 378493; #repopick: Add `--list` option + repopick 378494; #repopick: Require --force for closed changes found via --query + repopick 378458; #repopick: Fix apply order of dependent commits #repopick -it ten-firewall; - repopick -it Q_asb_2023-03 -e 352333; - repopick -it Q_asb_2023-04; - repopick -it Q_asb_2023-05; - repopick -it Q_asb_2023-06; - repopick -it Q_asb_2023-07 -e 362202; - repopick -it Q_asb_2023-08 -e 365443; - repopick -it Q_asb_2023-09; - repopick -it Q_asb_2023-10 -e 376554; - repopick -it Q_asb_2023-11 -e 376555; - repopick -it Q_asb_2023-12 -e 377251; + repopick -t Q_asb_2023-03 -e 352333,352570; + repopick -t Q_asb_2023-04; + repopick -t Q_asb_2023-05; + repopick -t Q_asb_2023-06; + repopick -t Q_asb_2023-07 -e 362202,376559; + repopick -t Q_asb_2023-08 -e 365443,376560,376561,376562; + repopick -t Q_asb_2023-09; + repopick -t Q_asb_2023-10 -e 376554; + repopick -t Q_asb_2023-11 -e 376555,376595,376596,376563,376568; + repopick -t Q_asb_2023-12 -e 377251,378083,378084,378085,378086,378087,378088,378314,378315; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-17.1/Patch.sh b/Scripts/LineageOS-17.1/Patch.sh index 6f5d2553..63effcca 100644 --- a/Scripts/LineageOS-17.1/Patch.sh +++ b/Scripts/LineageOS-17.1/Patch.sh @@ -145,6 +145,8 @@ git fetch https://github.com/LineageOS/android_external_pdfium refs/changes/85/3 git fetch https://github.com/LineageOS/android_external_pdfium refs/changes/86/378086/1 && git cherry-pick FETCH_HEAD; git fetch https://github.com/LineageOS/android_external_pdfium refs/changes/87/378087/1 && git cherry-pick FETCH_HEAD; git fetch https://github.com/LineageOS/android_external_pdfium refs/changes/88/378088/1 && git cherry-pick FETCH_HEAD; +git fetch https://github.com/LineageOS/android_external_pdfium refs/changes/14/378314/1 && git cherry-pick FETCH_HEAD; +git fetch https://github.com/LineageOS/android_external_pdfium refs/changes/15/378315/1 && git cherry-pick FETCH_HEAD; fi; if enterAndClear "external/svox"; then