Update cherrypicks

This commit is contained in:
Tad 2020-11-07 17:20:30 -05:00
parent dc5b1d91f2
commit a21a6acaa8
8 changed files with 8 additions and 26 deletions

View file

@ -133,8 +133,6 @@ patchWorkspace() {
repopick -it hh-p-sepolicy;
repopick -i 232948; #wahoo: liblight: close fd
#repopick -it CVE-2019-2306_P;
repopick -it P_asb_2020-11;
repopick -fi 291725; #update webview
source "$DOS_SCRIPTS/Patch.sh";
source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";

View file

@ -77,12 +77,6 @@ enterAndClear "device/qcom/sepolicy-legacy";
patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy-legacy/0001-Camera_Fix.patch"; #Fix camera on -user builds XXX: REMOVE THIS TRASH
echo "SELINUX_IGNORE_NEVERALLOWS := true" >> sepolicy.mk; #necessary for -user builds of legacy devices
enterAndClear "external/aac";
git pull "https://github.com/LineageOS/android_external_aac" refs/changes/75/291375/1; #P_asb_2020-11
enterAndClear "external/freetype";
git pull "https://github.com/LineageOS/android_external_freetype" refs/changes/65/291965/1; #CVE-2020-15999
enterAndClear "external/svox";
git revert --no-edit 1419d63b4889a26d22443fd8df1f9073bf229d3d; #Add back Makefiles
sed -i '12iLOCAL_SDK_VERSION := current' pico/Android.mk; #Fix build under Pie