From 66db536b08ce577ecff8d279a573d1113b85771b Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 16 May 2018 14:21:20 -0400 Subject: [PATCH] Tweaks --- Scripts/Common/Deblob.sh | 9 ++++++--- Scripts/LineageOS-14.1/Patch.sh | 2 +- Scripts/LineageOS-15.1/Patch.sh | 2 +- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/Scripts/Common/Deblob.sh b/Scripts/Common/Deblob.sh index 2e3f4fc3..a17ff85b 100755 --- a/Scripts/Common/Deblob.sh +++ b/Scripts/Common/Deblob.sh @@ -61,8 +61,8 @@ echo "Deblobbing..." #Clearkey (DRM) [Google] blobs=$blobs"|libdrmclearkeyplugin.so"; - #CMN (TrustZone?) [Qualcomm?] - #blobs=$blobs"|cmnlib.*"; + #CMN (DRM?) [?] + blobs=$blobs"|cmnlib.*"; #CNE (Automatic Cell/Wi-Fi Switching) [Qualcomm] #blobs=$blobs"|libcneapiclient.so|libNimsWrap.so"; #XXX: Breaks radio @@ -126,6 +126,9 @@ echo "Deblobbing..." #makes=$makes"|ipacm|IPACM_cfg.xml"; #kernels=$kernels" drivers/platform/msm/ipa"; + #IS? (DRM) [?] + blobs=$blobs"|isdbtmm.*"; + #Keystore/TrustZone (HW Crypto) [Qualcomm] #blobs=$blobs"|qseecomd|keystore.qcom.so|libdrmdecrypt.so|libdrmfs.so|libdrmtime.so|libQSEEComAPI.so|librpmb.so|libssd.so"; #blobs=$blobs"|keymaster.*"; @@ -228,7 +231,7 @@ deblobDevice() { replaceTime="false"; #Temp disable replacement if [ -f Android.mk ]; then #Some devices store these in a dedicated firmware partition, others in /system/vendor/firmware, either way the following are just symlinks - #sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(CMN_SYMLINKS)//' Android.mk; #Remove CMN firmware + sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(CMN_SYMLINKS)//' Android.mk; #Remove CMN firmware sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(DXHDCP2_SYMLINKS)//' Android.mk; #Remove Discretix firmware #sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(IMS_SYMLINKS)//' Android.mk; #Remove IMS firmware sed -i '/ALL_DEFAULT_INSTALLED_MODULES/s/$(PLAYREADY_SYMLINKS)//' Android.mk; #Remove Microsoft Playready firmware diff --git a/Scripts/LineageOS-14.1/Patch.sh b/Scripts/LineageOS-14.1/Patch.sh index 6beabd7a..f70c5fe0 100755 --- a/Scripts/LineageOS-14.1/Patch.sh +++ b/Scripts/LineageOS-14.1/Patch.sh @@ -84,7 +84,7 @@ patch -p1 < $patches"android_frameworks_base/0003-Signature_Spoofing.patch"; #Al patch -p1 < $patches"android_frameworks_base/0005-Harden_Sig_Spoofing.patch"; #Restrict signature spoofing to system apps signed with the platform key #patch -p1 < $patches"android_frameworks_base/0006-DNS_Cloudflare.patch"; #Switch to Cloudflare DNS patch -p1 < $patches"android_frameworks_base/0006-DNS_OpenNIC.patch"; #Switch to OpenNIC DNS -patch -p1 < $patches"android_frameworks_base/0007-Connectivity.patch"; #Change connectivity check URLs to ours +#patch -p1 < $patches"android_frameworks_base/0007-Connectivity.patch"; #Change connectivity check URLs to ours rm -rf packages/PrintRecommendationService; #App that just creates popups to install proprietary print apps rm core/res/res/values/config.xml.orig core/res/res/values/strings.xml.orig; diff --git a/Scripts/LineageOS-15.1/Patch.sh b/Scripts/LineageOS-15.1/Patch.sh index 70cc2aba..e8700eee 100755 --- a/Scripts/LineageOS-15.1/Patch.sh +++ b/Scripts/LineageOS-15.1/Patch.sh @@ -81,7 +81,7 @@ patch -p1 < $patches"android_frameworks_base/0002-Signature_Spoofing.patch"; #Al patch -p1 < $patches"android_frameworks_base/0003-Harden_Sig_Spoofing.patch"; #Restrict signature spoofing to system apps signed with the platform key #patch -p1 < $patches"android_frameworks_base/0004-DNS_Cloudflare.patch"; #Switch to Cloudflare DNS patch -p1 < $patches"android_frameworks_base/0004-DNS_OpenNIC.patch"; #Switch to OpenNIC DNS -patch -p1 < $patches"android_frameworks_base/0005-Connectivity.patch"; #Change connectivity check URLs to ours +#patch -p1 < $patches"android_frameworks_base/0005-Connectivity.patch"; #Change connectivity check URLs to ours if [ "$NON_COMMERCIAL_USE_PATCHES" = true ]; then patch -p1 < $patches"android_frameworks_base/Copperhead/0005-Deny_USB.patch"; fi; #Deny USB support (Copperhead CC BY-NC-SA) rm -rf packages/PrintRecommendationService; #App that just creates popups to install proprietary print apps rm core/res/res/values/config.xml.orig core/res/res/values/strings.xml.orig;