Small changes

- Fixup CVE-2020-36386 breakage
- Move some cherrypicks in tree (gerrit down right now, pulled from reflog)
- Update cherrypicks
This commit is contained in:
Tad 2021-06-14 16:43:04 -04:00
parent 8af1c6a2ee
commit d42c8f033d
41 changed files with 1020 additions and 128 deletions

View file

@ -103,11 +103,7 @@ export -f buildAll;
patchWorkspace() {
if [ "$DOS_MALWARE_SCAN_ENABLED" = true ]; then scanForMalware false "$DOS_PREBUILT_APPS $DOS_BUILD_BASE/build $DOS_BUILD_BASE/device $DOS_BUILD_BASE/vendor/lineage"; fi;
source build/envsetup.sh;
repopick -it a2dp-master-fixes;
repopick -i 311606 311607; #intent security fix
repopick -i 304614 312102; #apn fix
#repopick -it android-11.0.0_r38;
#source build/envsetup.sh;
source "$DOS_SCRIPTS/Patch.sh";
source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";