diff --git a/Patches/Common/android_device_oneplus_msm8998-common/0001-No_Vorbis_Offload.patch b/Patches/Common/android_device_oneplus_msm8998-common/0001-No_Vorbis_Offload.patch new file mode 100644 index 00000000..2c4ed2b0 --- /dev/null +++ b/Patches/Common/android_device_oneplus_msm8998-common/0001-No_Vorbis_Offload.patch @@ -0,0 +1,29 @@ +From 7874768d3288126484d8c0bfb19659ededb80ea3 Mon Sep 17 00:00:00 2001 +From: LuK1337 +Date: Sun, 23 Feb 2020 20:48:09 -0500 +Subject: [PATCH] msm8996-common: Don't advertise vorbis offloading support + +* Doesn't work at all. + +Change-Id: Icccbd9d1abb0da4b943b133a49803fbd0c0d5c2a +--- + audio/audio_policy_configuration.xml | 3 --- + 1 file changed, 3 deletions(-) + +diff --git a/audio/audio_policy_configuration.xml b/audio/audio_policy_configuration.xml +index 257225c..1526499 100644 +--- a/audio/audio_policy_configuration.xml ++++ b/audio/audio_policy_configuration.xml +@@ -141,9 +141,6 @@ + +- + +-- +2.24.1 + diff --git a/Patches/Linux b/Patches/Linux index f9c6cf0a..76dd11fb 160000 --- a/Patches/Linux +++ b/Patches/Linux @@ -1 +1 @@ -Subproject commit f9c6cf0abd0e02e7b42976bb37af977bc7107abd +Subproject commit 76dd11fb902b80b867a969395247eaddedf61646 diff --git a/PrebuiltApps b/PrebuiltApps index f5198ddc..93702842 160000 --- a/PrebuiltApps +++ b/PrebuiltApps @@ -1 +1 @@ -Subproject commit f5198ddce82a4b9974d8ad180bde7927c45c1bbb +Subproject commit 93702842d86914e6917ae7665c8a932db023710a diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index 965399ed..b0d0c230 100644 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -103,8 +103,10 @@ echo "Deblobbing..." ipcSec="4097:4294967295:2002:2950:3009:2901|4097:4294967295:3009"; #Dirac (Audio Codec + Effects) [Dirac] - blobs=$blobs"|libDiracAPI_SHARED.so|.*dirac.*"; - blobs=$blobs"|diracmobile.config"; + if [ "$DOS_DEBLOBBER_REMOVE_AUDIOFX" = true ]; then + blobs=$blobs"|libDiracAPI_SHARED.so|.*dirac.*"; + blobs=$blobs"|diracmobile.config"; + fi; #Discretix (DRM/HDCP) [Discretix Technologies] blobs=$blobs"|DxDrmServerIpc|discretix"; @@ -234,7 +236,7 @@ echo "Deblobbing..." blobs=$blobs"|libmm-hdcpmgr.so|libstagefright_hdcp.so|libhdcp2.so"; blobs=$blobs"|srm.bin|insthk|hdcp_test"; blobs=$blobs"|hdcp2xtest.srm"; - blobs=$blobs"|hdcp1.*|tzhdcp.*"; + blobs=$blobs"|hdcp1.*|hdcp2.*|tzhdcp.*"; #HDR blobs=$blobs"|libhdr.*.so|libdovi.so"; @@ -305,7 +307,7 @@ echo "Deblobbing..." blobs=$blobs"|cacert_location.pem|com.qti.location.sdk.xml|com.qualcomm.location.xml|izat.conf|izat.xt.srv.xml|lowi.conf|xtra_root_cert.pem|xtwifi.conf"; blobs=$blobs"|com.qti.location.sdk.jar|izat.xt.srv.jar"; blobs=$blobs"|com.qualcomm.location.apk|com.qualcomm.services.location.apk|xtra_t_app.apk"; - blobs=$blobs"|gpsone_daemon|izat.xt.srv|location-mq|loc_launcher|lowi-server|slim_ap_daemon|slim_daemon|xtwifi-client|xtwifi-inet-agent"; + blobs=$blobs"|gpsone_daemon|izat.xt.srv|location-mq|loc_launcher|lowi-server|slim_ap_daemon|slim_daemon|xtwifi-client|xtwifi-inet-agent|xtra-daemon"; overlay=$overlay"config_comboNetworkLocationProvider|config_enableFusedLocationOverlay|config_enableNetworkLocationOverlay|config_fusedLocationProviderPackageName|config_enableNetworkLocationOverlay|config_networkLocationProviderPackageName|com.qualcomm.location"; #Misc @@ -517,8 +519,9 @@ deblobDevice() { sed -i 's/BOARD_SUPPORTS_SOUND_TRIGGER_5514 := true/BOARD_SUPPORTS_SOUND_TRIGGER_5514 := false/' BoardConfig*.mk &>/dev/null || true; sed -i 's/AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := true/AUDIO_FEATURE_ENABLED_DS2_DOLBY_DAP := false/' BoardConfig*.mk &>/dev/null || true; #Disable Dolby sed -i 's/BOARD_ANT_WIRELESS_DEVICE := true/BOARD_ANT_WIRELESS_DEVICE := false/' BoardConfig*.mk &>/dev/null || true; #Disable ANT + awk -i inplace '!/BOARD_ANT_WIRELESS_DEVICE/' BoardConfig*.mk &>/dev/null || true; if [ "$DOS_DEBLOBBER_REMOVE_RENDERSCRIPT" = true ] || [ "$DOS_DEBLOBBER_REMOVE_GRAPHICS" = true ]; then - awk -i inplace '!/RS_DRIVER/' BoardConfig*.mk&>/dev/null || true; + awk -i inplace '!/RS_DRIVER/' BoardConfig*.mk &>/dev/null || true; fi; if [ -f common.mk ]; then awk -i inplace '!/'"$makes"'/' common.mk; #Remove references from common makefile diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index 963e5002..3680ca84 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -70,7 +70,7 @@ gpgVerifyDirectory() { export -f gpgVerifyDirectory; scanForMalware() { - if [ -x /usr/bin/clamscan ] && [ -r /var/lib/clamav/main.cvd ]; then + if [ -x /usr/bin/clamscan ] && [ -r /var/lib/clamav/main.c*d ]; then echo -e "\e[0;32mStarting a malware scan...\e[0m"; local excludes="--exclude-dir=\".git\" --exclude-dir=\".repo\""; local scanQueue="$2"; @@ -224,11 +224,17 @@ processRelease() { #Extract signed recovery unzip -l $OUT_DIR/$PREFIX-target_files.zip | grep -q recovery.img; - if [ "$?" == "0" ]; then + local hasRecoveryImg=$?; + if [ "$hasRecoveryImg" == "0" ]; then echo -e "\e[0;32mExtracting signed recovery.img\e[0m"; mkdir $OUT_DIR/rec_tmp; unzip $OUT_DIR/$PREFIX-target_files.zip IMAGES/recovery.img -d $OUT_DIR/rec_tmp; mv $OUT_DIR/rec_tmp/IMAGES/recovery.img $OUT_DIR/$PREFIX-recovery.img; + #else + # echo -e "\e[0;32mExtracting signed boot.img\e[0m"; + # mkdir $OUT_DIR/rec_tmp; + # unzip $OUT_DIR/$PREFIX-target_files.zip IMAGES/boot.img -d $OUT_DIR/rec_tmp; + # mv $OUT_DIR/rec_tmp/IMAGES/boot.img $OUT_DIR/$PREFIX-boot.img; fi; #Copy to archive @@ -570,7 +576,7 @@ hardenDefconfig() { #Disable supported options #Disabled: CONFIG_MSM_SMP2P_TEST, CONFIG_MAGIC_SYSRQ (breaks compile on many kernels), CONFIG_KALLSYMS (breaks boot on select devices), CONFIG_IKCONFIG (breaks recovery) declare -a optionsNo=("CONFIG_ACPI_APEI_EINJ" "CONFIG_ACPI_CUSTOM_METHOD" "CONFIG_ACPI_TABLE_UPGRADE" "CONFIG_BINFMT_AOUT" "CONFIG_BINFMT_MISC" "CONFIG_CHECKPOINT_RESTORE" "CONFIG_COMPAT_BRK" "CONFIG_COMPAT_VDSO" "CONFIG_CP_ACCESS64" "CONFIG_DEVKMEM" "CONFIG_DEVMEM" "CONFIG_DEVPORT" "CONFIG_EARJACK_DEBUGGER" "CONFIG_GCC_PLUGIN_RANDSTRUCT_PERFORMANCE" "CONFIG_HARDENED_USERCOPY_FALLBACK" "CONFIG_HIBERNATION" "CONFIG_HWPOISON_INJECT" "CONFIG_IA32_EMULATION" "CONFIG_IOMMU_NON_SECURE" "CONFIG_IP_DCCP" "CONFIG_IP_SCTP" "CONFIG_KEXEC" "CONFIG_KEXEC_FILE" "CONFIG_KSM" "CONFIG_LDISC_AUTOLOAD" "CONFIG_LEGACY_PTYS" "CONFIG_LIVEPATCH" "CONFIG_MEM_SOFT_DIRTY" "CONFIG_MMIOTRACE" "CONFIG_MMIOTRACE_TEST" "CONFIG_MODIFY_LDT_SYSCALL" "CONFIG_MSM_BUSPM_DEV" "CONFIG_NEEDS_SYSCALL_FOR_CMPXCHG" "CONFIG_NOTIFIER_ERROR_INJECTION" "CONFIG_OABI_COMPAT" "CONFIG_PAGE_OWNER" "CONFIG_PROC_KCORE" "CONFIG_PROC_PAGE_MONITOR" "CONFIG_PROC_VMCORE" "CONFIG_RDS" "CONFIG_RDS_TCP" "CONFIG_SECURITY_SELINUX_DISABLE" "CONFIG_SLAB_MERGE_DEFAULT" "CONFIG_TIMER_STATS" "CONFIG_TSC" "CONFIG_TSPP2" "CONFIG_UKSM" "CONFIG_UPROBES" "CONFIG_USELIB" "CONFIG_USERFAULTFD" "CONFIG_WLAN_FEATURE_MEMDUMP" "CONFIG_X86_PTDUMP" "CONFIG_X86_VSYSCALL_EMULATION" "CONFIG_ZSMALLOC_STAT"); - if [[ "$1" != *"kernel/htc/msm8994"* ]] && [[ "$1" != *"kernel/samsung/smdk4412"* ]] && [[ "$1" != *"kernel/htc/flounder"* ]] && [[ "$1" != *"kernel/amazon/hdx-common"* ]] && [[ "$1" != *"msm899"* ]]; then + if [[ "$1" != *"kernel/htc/msm8994"* ]] && [[ "$1" != *"kernel/samsung/smdk4412"* ]] && [[ "$1" != *"kernel/htc/flounder"* ]] && [[ "$1" != *"kernel/amazon/hdx-common"* ]] && [[ "$1" != *"msm899"* ]] && [[ "$1" != *"sdm8"* ]] && [[ "$1" != *"sdm6"* ]]; then optionsNo+=("CONFIG_DIAG_CHAR" "CONFIG_DIAG_OVER_USB" "CONFIG_USB_QCOM_DIAG_BRIDGE" "CONFIG_DIAGFWD_BRIDGE_CODE" "CONFIG_DIAG_SDIO_PIPE" "CONFIG_DIAG_HSIC_PIPE" "CONFIG_INET_DIAG"); fi; if [ "$DOS_DEBLOBBER_REMOVE_IPA" = true ]; then optionsNo+=("CONFIG_IPA" "CONFIG_RMNET_IPA"); fi; diff --git a/Scripts/LineageOS-14.1/Functions.sh b/Scripts/LineageOS-14.1/Functions.sh index 7216dd92..5ab26fc9 100644 --- a/Scripts/LineageOS-14.1/Functions.sh +++ b/Scripts/LineageOS-14.1/Functions.sh @@ -119,7 +119,6 @@ patchWorkspace() { repopick -it n_asb_09-2018-qcom; repopick -it ibss-mode-nougat; repopick -it n-netd; - repopick -i 268340; #update webview repopick -i 268803 268804; #sqlite vulns export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-15.1/Functions.sh b/Scripts/LineageOS-15.1/Functions.sh index b633f440..5342ed1d 100644 --- a/Scripts/LineageOS-15.1/Functions.sh +++ b/Scripts/LineageOS-15.1/Functions.sh @@ -104,8 +104,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 -i 268340; #update webview + #source build/envsetup.sh; export DOS_GRAPHENE_MALLOC=false; #patches apply, compile fails diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 5593cea7..ec5c5f73 100644 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -226,6 +226,9 @@ echo "allow kickstart usbfs:dir search;" >> sepolicy/kickstart.te; #Fix forceenc enterAndClear "device/moto/shamu"; #git revert --no-edit 05fb49518049440f90423341ff25d4f75f10bc0c; #restore releasetools #TODO +enterAndClear "device/oneplus/msm8998-common"; +patch -p1 < "$DOS_PATCHES_COMMON/android_device_oneplus_msm8998-common/0001-No_Vorbis_Offload.patch"; #Fix Ogg Vorbis playback + enterAndClear "device/oppo/msm8974-common"; sed -i "s/TZ.BF.2.0-2.0.0134/TZ.BF.2.0-2.0.0134|TZ.BF.2.0-2.0.0137/" board-info.txt; #Suport new TZ firmware https://review.lineageos.org/#/c/178999/ diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 5f79ec73..f7ee70df 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -117,8 +117,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 -i 268340; #update webview + #source build/envsetup.sh; source "$DOS_SCRIPTS/Patch.sh"; source "$DOS_SCRIPTS/Defaults.sh"; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 1c9322e2..5c711bef 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -256,6 +256,10 @@ git revert --no-edit 0a4257bd3b6f76010f4f7c564c4b3d7794af0640; #breaks build enterAndClear "device/oneplus/oneplus2"; sed -i 's|etc/permissions/qti_libpermissions.xml|vendor/etc/permissions/qti_libpermissions.xml|' proprietary-files.txt; +enterAndClear "device/oneplus/msm8998-common"; +patch -p1 < "$DOS_PATCHES_COMMON/android_device_oneplus_msm8998-common/0001-No_Vorbis_Offload.patch"; #Fix Ogg Vorbis playback +awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #disable releasetools to fix delta ota generation + enterAndClear "device/oppo/common"; awk -i inplace '!/TARGET_RELEASETOOLS_EXTENSIONS/' BoardConfigCommon.mk; #disable releasetools to fix delta ota generation