diff --git a/Misc/Features/Andhrystone.txt b/Misc/Features/Andhrystone.txt index d74a8a72..04dfe982 100644 --- a/Misc/Features/Andhrystone.txt +++ b/Misc/Features/Andhrystone.txt @@ -1,19 +1,31 @@ -msm8930 - n800 - 5.5m/10.8m +Tegra + grouper/14.1 - 4.7m/18.4m + dragon/15.1 - -tegra 3 - grouper bOC - 5.4m/5.4m - grouper 4.4 - 4.9m/19.6m - grouper ADS - 5.2m/20m - grouper - 4.7m/18.4m +OMAP + toroplus/14.1 - 4.6m/9.4m -msm8960 - mako oc - 6.4m/20.2m +SDS4P + mako/18.1 - 6.7/13.4m -msm8974 - thor oc - 9.9m/19.8m - d852 oc - 13.9m/25.0m - bacon oc - +SD400 + n800/11.0 - 5.5m/10.8m -msm8992 - clark - 6.9/48.2m +SD801 + d852/18.1 - 12.3m/25.0m + bacon/18.1 - 12.4/24.9m + klte/18.1 - 12.1/24.6m + +SD808 + clark/17.1 - 6.9/41.8m + +SD821 + sailfish/18.1 - 18.0m/58.4m + +SD835 + cheeseburger/18.1 - 18.4m/106.2m + mata/19.1 - 17.8/105.4m + taimen/19.1 - 18.5/107.2m + +SD845 + fajita/19.1 - 27.8/141.3m diff --git a/Patches/LineageOS-17.1/android_frameworks_base/0015-Automatic_Reboot.patch b/Patches/LineageOS-17.1/android_frameworks_base/0015-Automatic_Reboot.patch index 92168c8d..3f4ca108 100644 --- a/Patches/LineageOS-17.1/android_frameworks_base/0015-Automatic_Reboot.patch +++ b/Patches/LineageOS-17.1/android_frameworks_base/0015-Automatic_Reboot.patch @@ -55,7 +55,7 @@ index 55104b4e0ee2..5ed2807922d9 100644 diff --git a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java -index 34f075d601cc..035581bd39a4 100644 +index f025575623ca..8b36241ea33a 100644 --- a/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java +++ b/packages/SystemUI/src/com/android/systemui/keyguard/KeyguardViewMediator.java @@ -152,6 +152,8 @@ public class KeyguardViewMediator extends SystemUI { @@ -117,7 +117,7 @@ index 34f075d601cc..035581bd39a4 100644 /** * Let's us know when the device is waking up. */ -@@ -1370,6 +1394,10 @@ public class KeyguardViewMediator extends SystemUI { +@@ -1372,6 +1396,10 @@ public class KeyguardViewMediator extends SystemUI { if (DEBUG) Log.d(TAG, "doKeyguard: showing the lock screen"); showLocked(options); @@ -128,7 +128,7 @@ index 34f075d601cc..035581bd39a4 100644 } private void lockProfile(int userId) { -@@ -1530,6 +1558,12 @@ public class KeyguardViewMediator extends SystemUI { +@@ -1535,6 +1563,12 @@ public class KeyguardViewMediator extends SystemUI { } } } @@ -141,7 +141,7 @@ index 34f075d601cc..035581bd39a4 100644 } } }; -@@ -1947,6 +1981,7 @@ public class KeyguardViewMediator extends SystemUI { +@@ -1953,6 +1987,7 @@ public class KeyguardViewMediator extends SystemUI { mHideAnimationRun = false; adjustStatusBarLocked(); sendUserPresentBroadcast(); diff --git a/Patches/LineageOS-17.1/android_packages_apps_Settings/0004-Private_DNS.patch b/Patches/LineageOS-17.1/android_packages_apps_Settings/0004-Private_DNS.patch index c6e5a26e..1ce68c19 100644 --- a/Patches/LineageOS-17.1/android_packages_apps_Settings/0004-Private_DNS.patch +++ b/Patches/LineageOS-17.1/android_packages_apps_Settings/0004-Private_DNS.patch @@ -252,7 +252,7 @@ index 1655c69cea..0beef5fc13 100644 mMode = PRIVATE_DNS_MODE_OPPORTUNISTIC; break; diff --git a/src/com/android/settings/network/PrivateDnsPreferenceController.java b/src/com/android/settings/network/PrivateDnsPreferenceController.java -index 47c3a95c9f..5f4e0937c2 100644 +index b74345170c..0cbb9d52de 100644 --- a/src/com/android/settings/network/PrivateDnsPreferenceController.java +++ b/src/com/android/settings/network/PrivateDnsPreferenceController.java @@ -17,6 +17,19 @@ @@ -275,7 +275,7 @@ index 47c3a95c9f..5f4e0937c2 100644 import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_OPPORTUNISTIC; import static android.net.ConnectivityManager.PRIVATE_DNS_MODE_PROVIDER_HOSTNAME; import static android.provider.Settings.Global.PRIVATE_DNS_DEFAULT_MODE; -@@ -125,6 +138,58 @@ public class PrivateDnsPreferenceController extends BasePreferenceController +@@ -128,6 +141,58 @@ public class PrivateDnsPreferenceController extends BasePreferenceController switch (mode) { case PRIVATE_DNS_MODE_OFF: return res.getString(R.string.private_dns_mode_off); diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index 67061303..471b7d44 100644 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -259,6 +259,7 @@ echo "Deblobbing..."; blobs=$blobs"|SCONE.apk"; #??? blobs=$blobs"|DevicePersonalizationPrebuilt.*.apk|DeviceIntelligence.*.apk"; overlay=$overlay"|config_defaultAttentionService|config_defaultSystemCaptionsManagerService|config_defaultSystemCaptionsService|config_systemAmbientAudioIntelligence|config_systemAudioIntelligence|config_systemNotificationIntelligence|config_systemTextIntelligence|config_systemUiIntelligence|config_systemVisualIntelligence|config_defaultContentSuggestionsService"; + overlay=$overlay"|config_defaultWellbeingPackage|config_defaultSupervisionProfileOwnerComponent"; overlay=$overlay"|platform_carrier_config_package"; #EUICC (Virtual SIM) [Google] @@ -441,6 +442,7 @@ echo "Deblobbing..."; #blobs=$blobs"|liboemlock.so|liboemlock.*.so|liboemlock-provision.so"; #makes=$makes"|android.hardware.oemlock.*"; #manifests=$manifests"|OemLock"; + overlay=$overlay"|config_persistentDataPackageName"; #OMA-DM/SyncML #See: https://www.blackhat.com/docs/us-14/materials/us-14-Solnik-Cellular-Exploitation-On-A-Global-Scale-The-Rise-And-Fall-Of-The-Control-Protocol.pdf blobs=$blobs"|SyncMLSvc.apk|libsyncml_core.so|libsyncml_port.so"; #SyncML @@ -861,8 +863,12 @@ find device -name "*.mk" -type f -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'awk #find kernel -maxdepth 2 -mindepth 2 -type d -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'deblobKernel "{}"'; #Deblob all kernel directories find vendor -name "*endor*.mk" -type f -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'deblobVendorMk "{}"'; #Deblob all makefiles find vendor -name "Android.bp" -type f -print0 | xargs -0 -n 1 -P 8 -I {} bash -c 'deblobVendorBp "{}"'; #Deblob all makefiles +if [ "$DOS_VERSION" != "LineageOS-14.1" ]; then perl -0777 -pe 's,(.*?),$1 =~ /'$manifests'/?"":$1,gse' -i $(grep 'format="hidl"' "$DOS_BUILD_BASE/device" -ril); #Deblob all matrixes #Credit: https://unix.stackexchange.com/a/72160 perl -0777 -pe 's,(.*?),$1 =~ /'$manifests'/?"":$1,gse' -i $(grep 'format="hidl"' "$DOS_BUILD_BASE/hardware/interfaces" -ril); +else +echo "Skipping manifest deblobbing"; +fi; deblobVendors; #Deblob entire vendor directory rm -rf frameworks/av/drm/mediadrm/plugins/clearkey; #Remove ClearKey #rm -rf frameworks/av/drm/mediacas/plugins/clearkey; #XXX: breaks protobuf inclusion diff --git a/Scripts/Common/Functions.sh b/Scripts/Common/Functions.sh index 333de211..3bbd5bff 100644 --- a/Scripts/Common/Functions.sh +++ b/Scripts/Common/Functions.sh @@ -921,8 +921,8 @@ hardenDefconfig() { #Disable supported options #Disabled: MSM_SMP2P_TEST, MAGIC_SYSRQ (breaks compile), KALLSYMS (breaks boot on select devices), IKCONFIG (breaks recovery), MSM_DLOAD_MODE (breaks compile), PROC_PAGE_MONITOR (breaks memory stats), SCHED_DEBUG (breaks compile), INET_DIAG declare -a optionsNo=("ACPI_APEI_EINJ" "ACPI_CUSTOM_METHOD" "ACPI_TABLE_UPGRADE" "BINFMT_AOUT" "BINFMT_MISC" "BLK_DEV_FD" "BT_HS" "CHECKPOINT_RESTORE" "COMPAT_BRK" "COMPAT_VDSO" "CP_ACCESS64" "DEBUG_KMEMLEAK" "DEVKMEM" "DEVMEM" "DEVPORT" "EARJACK_DEBUGGER" "GCC_PLUGIN_RANDSTRUCT_PERFORMANCE" "FB_VIRTUAL" "HARDENED_USERCOPY_FALLBACK" "HARDENED_USERCOPY_PAGESPAN" "HIBERNATION" "HWPOISON_INJECT" "IA32_EMULATION" "IOMMU_NON_SECURE" "INPUT_EVBUG" "IO_URING" "IP_DCCP" "IP_SCTP" "KEXEC" "KEXEC_FILE" "KSM" "LDISC_AUTOLOAD" "LEGACY_PTYS" "LIVEPATCH" "MEM_SOFT_DIRTY" "MMIOTRACE" "MMIOTRACE_TEST" "MODIFY_LDT_SYSCALL" "MSM_BUSPM_DEV" "NEEDS_SYSCALL_FOR_CMPXCHG" "NOTIFIER_ERROR_INJECTION" "OABI_COMPAT" "PAGE_OWNER" "PROC_KCORE" "PROC_VMCORE" "RDS" "RDS_TCP" "SECURITY_SELINUX_DISABLE" "SECURITY_WRITABLE_HOOKS" "SLAB_MERGE_DEFAULT" "STACKLEAK_METRICS" "STACKLEAK_RUNTIME_DISABLE" "TIMER_STATS" "TSC" "TSPP2" "UKSM" "UPROBES" "USELIB" "USERFAULTFD" "VIDEO_VIVID" "WLAN_FEATURE_MEMDUMP" "X86_IOPL_IOPERM" "X86_PTDUMP" "X86_VSYSCALL_EMULATION" "ZSMALLOC_STAT"); - optionsNo+=("FTRACE" "KPROBE_EVENTS" "UPROBE_EVENTS" "GENERIC_TRACER" "FUNCTION_TRACER" "STACK_TRACER" "HIST_TRIGGERS" "BLK_DEV_IO_TRACE" "FAIL_FUTEX"); - optionsNo+=("CORESIGHT_CSR" "CORESIGHT_CTI_SAVE_DISABLE" "CORESIGHT_CTI" "CORESIGHT_DBGUI" "CORESIGHT_ETM" "CORESIGHT_ETMV4" "CORESIGHT_EVENT" "CORESIGHT_FUNNEL" "CORESIGHT_FUSE" "CORESIGHT_HWEVENT" "CORESIGHT_QPDI" "CORESIGHT_REMOTE_ETM" "CORESIGHT_REPLICATOR" "CORESIGHT_STM_DEFAULT_ENABLE" "CORESIGHT_STM" "CORESIGHT_TMC" "CORESIGHT_TPDA" "CORESIGHT_TPDM_DEFAULT_ENABLE" "CORESIGHT_TPDM" "CORESIGHT_TPIU" "CORESIGHT" "DEBUG_ATOMIC_SLEEP" "DEBUG_BUS_VOTER" "DEBUG_MUTEXES" "DEBUG_PAGEALLOC" "DEBUG_STACK_USAGE" "DYNAMIC_DEBUG" "FB_MSM_MDSS_XLOG_DEBUG" "HAVE_CORESIGHT_SINK" "HAVE_DEBUG_BUGVERBOSE" "HAVE_DEBUG_KMEMLEAK" "IOMMU_DEBUG" "IOMMU_DEBUG_TRACKING" "IOMMU_TESTS" "L2TP_DEBUGFS" "LOCKUP_DETECTOR" "LOG_BUF_MAGIC" "MSMB_CAMERA_DEBUG" "MSM_CAMERA_DEBUG" "MSM_SMD_DEBUG" "OF_CORESIGHT" "PREEMPT_TRACER" "DEBUG_SPINLOCK"); + #optionsNo+=("FTRACE" "KPROBE_EVENTS" "UPROBE_EVENTS" "GENERIC_TRACER" "FUNCTION_TRACER" "STACK_TRACER" "HIST_TRIGGERS" "BLK_DEV_IO_TRACE" "FAIL_FUTEX" "DYNAMIC_DEBUG"); + optionsNo+=("CORESIGHT_CSR" "CORESIGHT_CTI_SAVE_DISABLE" "CORESIGHT_CTI" "CORESIGHT_DBGUI" "CORESIGHT_ETM" "CORESIGHT_ETMV4" "CORESIGHT_EVENT" "CORESIGHT_FUNNEL" "CORESIGHT_FUSE" "CORESIGHT_HWEVENT" "CORESIGHT_QPDI" "CORESIGHT_REMOTE_ETM" "CORESIGHT_REPLICATOR" "CORESIGHT_STM_DEFAULT_ENABLE" "CORESIGHT_STM" "CORESIGHT_TMC" "CORESIGHT_TPDA" "CORESIGHT_TPDM_DEFAULT_ENABLE" "CORESIGHT_TPDM" "CORESIGHT_TPIU" "CORESIGHT" "DEBUG_ATOMIC_SLEEP" "DEBUG_BUS_VOTER" "DEBUG_MUTEXES" "DEBUG_PAGEALLOC" "DEBUG_STACK_USAGE" "FB_MSM_MDSS_XLOG_DEBUG" "HAVE_CORESIGHT_SINK" "HAVE_DEBUG_BUGVERBOSE" "HAVE_DEBUG_KMEMLEAK" "IOMMU_DEBUG" "IOMMU_DEBUG_TRACKING" "IOMMU_TESTS" "L2TP_DEBUGFS" "LOCKUP_DETECTOR" "LOG_BUF_MAGIC" "MSMB_CAMERA_DEBUG" "MSM_CAMERA_DEBUG" "MSM_SMD_DEBUG" "OF_CORESIGHT" "PREEMPT_TRACER" "DEBUG_SPINLOCK"); if [ "$DOS_DEBLOBBER_REMOVE_IPA" = true ]; then optionsNo+=("IPA" "RMNET_IPA"); fi; optionsNo+=("WIREGUARD"); #Requires root access, which we do not provide diff --git a/Scripts/LineageOS-16.0/Functions.sh b/Scripts/LineageOS-16.0/Functions.sh index 8021711f..ac2a04d6 100644 --- a/Scripts/LineageOS-16.0/Functions.sh +++ b/Scripts/LineageOS-16.0/Functions.sh @@ -80,7 +80,7 @@ patchWorkspace() { source build/envsetup.sh; #repopick -it pie-firewall; - repopick -it P_asb_2022-04; + repopick -it P_asb_2022-05; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh"; diff --git a/Scripts/LineageOS-16.0/Patch.sh b/Scripts/LineageOS-16.0/Patch.sh index 78287547..d1fa3dba 100644 --- a/Scripts/LineageOS-16.0/Patch.sh +++ b/Scripts/LineageOS-16.0/Patch.sh @@ -98,7 +98,7 @@ sed -i '74i$(my_res_package): PRIVATE_AAPT_FLAGS += --auto-add-overlay' core/aap if [ "$DOS_SILENCE_INCLUDED" = true ]; then sed -i 's/messaging/Silence/' target/product/aosp_base_telephony.mk target/product/treble_common.mk; fi; #Replace the Messaging app with Silence sed -i 's/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 17/PLATFORM_MIN_SUPPORTED_TARGET_SDK_VERSION := 28/' core/version_defaults.mk; #Set the minimum supported target SDK to Pie (GrapheneOS) awk -i inplace '!/Email/' target/product/core.mk; #Remove Email -sed -i 's/2022-01-05/2022-04-05/' core/version_defaults.mk; #Bump Security String #P_asb_2022-04 #XXX +sed -i 's/2022-01-05/2022-05-05/' core/version_defaults.mk; #Bump Security String #P_asb_2022-05 #XXX fi; if enterAndClear "build/soong"; then diff --git a/Scripts/LineageOS-19.1/Functions.sh b/Scripts/LineageOS-19.1/Functions.sh index 390e04a0..463f8104 100644 --- a/Scripts/LineageOS-19.1/Functions.sh +++ b/Scripts/LineageOS-19.1/Functions.sh @@ -99,6 +99,7 @@ patchWorkspace() { source build/envsetup.sh; repopick -i 330781; #PermissionManager: add null check for mLocationProviderPkgName, mLocationExtraPkgNames + #repopick -it S_asb_2022-05; sh "$DOS_SCRIPTS/Patch.sh"; sh "$DOS_SCRIPTS_COMMON/Enable_Verity.sh";