mirror of
https://github.com/Divested-Mobile/DivestOS-Build.git
synced 2025-05-02 14:36:17 -04:00
Reconcile picks
Signed-off-by: Thaddeus <tad@spotco.us>
This commit is contained in:
parent
85e3c271ab
commit
ab49a7e2a5
3 changed files with 1 additions and 118 deletions
|
@ -386,10 +386,6 @@ if enterAndClear "system/extras"; then
|
|||
applyPatch "$DOS_PATCHES/android_system_extras/0001-ext4_pad_filenames.patch"; #FBE: pad filenames more (GrapheneOS)
|
||||
fi;
|
||||
|
||||
if enterAndClear "system/netd"; then
|
||||
applyPatch "$DOS_PATCHES/android_system_netd/377024-backport.patch"; #R_asb_2023-12 Fix Heap-use-after-free in MDnsSdListener::Monitor::run #XXX
|
||||
fi;
|
||||
|
||||
if enterAndClear "system/sepolicy"; then
|
||||
applyPatch "$DOS_PATCHES/android_system_sepolicy/0002-protected_files.patch"; #label protected_{fifos,regular} as proc_security (GrapheneOS)
|
||||
#applyPatch "$DOS_PATCHES/android_system_sepolicy/0003-ptrace_scope-1.patch"; #Allow init to control kernel.yama.ptrace_scope (GrapheneOS)
|
||||
|
|
|
@ -78,6 +78,7 @@ patchWorkspaceReal() {
|
|||
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
|
||||
|
||||
source build/envsetup.sh;
|
||||
repipick -i 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;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue