Update cherrpicks

This commit is contained in:
Tad 2020-12-21 03:44:07 -05:00
parent 7e47d62835
commit 356c743cd8
8 changed files with 3 additions and 19 deletions

@ -1 +1 @@
Subproject commit e9de127d3c10ac01addc7a8db635a1d4eeb0c646
Subproject commit 067de1d6487c0b30d8a674d859c0257ba8b5b03b

@ -1 +1 @@
Subproject commit 3e7211f76dfac3ad45c9a7972167973466f13c65
Subproject commit d971e0d81b487086d5e9cdc8d251eba751fab48f

View File

@ -121,8 +121,6 @@ patchWorkspace() {
repopick -it n_asb_09-2018-qcom;
#repopick -it bt-sbc-hd-dualchannel-nougat;
repopick -it ibss-mode-nougat;
repopick -it n-asb-2020-11;
repopick -it n-asb-2020-12;
export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails

View File

@ -76,9 +76,6 @@ enterAndClear "device/qcom/sepolicy";
patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/248649.patch"; #msm_irqbalance: Allow read for stats and interrupts
patch -p1 < "$DOS_PATCHES/android_device_qcom_sepolicy/0001-Camera_Fix.patch"; #Fix camera on user builds XXX: REMOVE THIS TRASH
enterAndClear "external/freetype";
git pull "https://github.com/LineageOS/android_external_freetype" refs/changes/69/291969/1; #CVE-2020-15999
enterAndClear "external/sqlite";
patch -p1 < "$DOS_PATCHES/android_external_sqlite/0001-Secure_Delete.patch"; #Enable secure_delete by default (CopperheadOS-13.0)

View File

@ -110,8 +110,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 O_asb_2020-12;
#source build/envsetup.sh;
export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails

View File

@ -103,9 +103,6 @@ if [ "$DOS_MICROG_INCLUDED" != "FULL" ]; then rm -rf packages/CompanionDeviceMan
rm -rf packages/Osu packages/Osu2; #Automatic Wi-Fi connection non-sense
rm -rf packages/PrintRecommendationService; #Creates popups to install proprietary print apps
enterAndClear "frameworks/layoutlib";
git pull "https://github.com/LineageOS/android_frameworks_layoutlib" refs/changes/53/295953/1; #O_asb_2020-12
if [ "$DOS_DEBLOBBER_REMOVE_IMS" = true ]; then
enterAndClear "frameworks/opt/net/ims";
patch -p1 < "$DOS_PATCHES/android_frameworks_opt_net_ims/0001-Fix_Calling.patch"; #Fix calling when IMS is removed
@ -175,9 +172,6 @@ git revert --no-edit a6a4ce8e9a6d63014047a447c6bb3ac1fa90b3f4; #Always update re
patch -p1 < "$DOS_PATCHES/android_system_core/0001-Harden.patch"; #Harden mounts with nodev/noexec/nosuid + misc sysfs changes (GrapheneOS)
if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES_COMMON/android_system_core/0001-HM-Increase_vm_mmc.patch"; fi; #(GrapheneOS)
enterAndClear "system/media";
git pull "https://github.com/LineageOS/android_system_media" refs/changes/57/295957/1; #O_asb_2020-12
enterAndClear "system/sepolicy";
patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch"; #Fix -user builds for LGE devices
patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/26.0";

View File

@ -134,7 +134,6 @@ patchWorkspace() {
repopick -i 232948; #wahoo: liblight: close fd
#repopick -it pie-firewall;
#repopick -it CVE-2019-2306_P;
repopick -it P_asb_2020-12;
source "$DOS_SCRIPTS/Patch.sh";
source "$DOS_SCRIPTS_COMMON/Copy_Keys.sh";

View File

@ -167,9 +167,6 @@ if [ "$DOS_GRAPHENE_MALLOC" = true ]; then patch -p1 < "$DOS_PATCHES_COMMON/andr
enterAndClear "system/extras";
patch -p1 < "$DOS_PATCHES/android_system_extras/0001-ext4_pad_filenames.patch"; #FBE: pad filenames more (GrapheneOS)
enterAndClear "system/media";
git pull "https://github.com/LineageOS/android_system_media" refs/changes/57/295857/1; #P_asb_2020-12
enterAndClear "system/sepolicy";
patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch"; #Fix -user builds for LGE devices
patch -p1 < "$DOS_PATCHES/android_system_sepolicy/0001-LGE_Fixes.patch" --directory="prebuilts/api/28.0";