Small tweaks + churn

Fixes recovery not booting on 20.0

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2022-12-03 13:50:49 -05:00
parent 038fca449b
commit 178e127338
No known key found for this signature in database
GPG key ID: B286E9F57A07424B
8 changed files with 16 additions and 12 deletions

View file

@ -103,8 +103,7 @@ patchWorkspace() {
gpgVerifyGitHead "$DOS_BUILD_BASE/external/chromium-webview";
source build/envsetup.sh;
repopick -i 343790; #usb: have enableUsbDataSignal() call queryPortStatus() if successful
repopick -i 343791; #UsbManager: enableUsbDataSignal: return early if HAL version is too old
repopick -i 344891; #fixup! Rewrite trust USB restriction handling
#repopick -it T_tzdb2022f;
sh "$DOS_SCRIPTS/Patch.sh";

View file

@ -415,7 +415,12 @@ if enterAndClear "device/google/redbull"; then
awk -i inplace '!/sctp/' BoardConfig-common.mk modules.load; #fix compile after hardenDefconfig
fi;
if enterAndClear "device/google/wahoo"; then
git revert --no-edit 4e9cf40ae5e8a334989b46405ab09dba575f61fa; #revert compressed ramdisk due to potential breakage
fi;
if enterAndClear "kernel/google/wahoo"; then
git revert --no-edit 4fc7c2f4d9a187396cc6efb4a0cc003850f3f79d; #revert compressed ramdisk due to potential breakage
sed -i 's/asm(SET_PSTATE_UAO(1));/asm(SET_PSTATE_UAO(1)); return 0;/' arch/arm64/mm/fault.c; #fix build with CONFIG_ARM64_UAO
fi;

View file

@ -16,7 +16,7 @@
umask 0022;
set -uo pipefail;
export version="108.0.5359.61-1";
export version="108.0.5359.79-1";
export PATH=$PATH:$HOME/Android/Sdk/build-tools/33.0.0;
export webviewARM32="/mnt/dos/Repos/DivestOS_WebView/prebuilt/arm/webview.apk";
export webviewARM64="/mnt/dos/Repos/DivestOS_WebView/prebuilt/arm64/webview.apk";