Reconcile picks

This gains one us patch: 376607

Signed-off-by: Tad <tad@spotco.us>
This commit is contained in:
Tad 2023-12-11 18:45:22 -05:00
parent 85aa8d153d
commit ba1e29a1b1
No known key found for this signature in database
GPG key ID: B286E9F57A07424B
30 changed files with 7 additions and 2720 deletions

View file

@ -139,7 +139,6 @@ git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefil
fi;
if enterAndClear "external/webp"; then
applyPatch "$DOS_PATCHES_COMMON/android_external_webp/373948.patch"; #R_asb_2023-11 Update to v1.1.0-8-g50f60add
sed -i '85i\ \ \ \ \ \ \ \ "src/utils/filters_utils.c",' Android.bp; #Fixup
fi;