From 5a2d8076666e18c5ac01017a36fb088181109bb6 Mon Sep 17 00:00:00 2001 From: Tad Date: Wed, 28 Jun 2017 22:17:21 -0400 Subject: [PATCH] Tweaks --- Scripts/Generic_Deblob.sh | 10 ++++++---- Scripts/LAOS-14.1_Patches.sh | 4 ++-- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/Scripts/Generic_Deblob.sh b/Scripts/Generic_Deblob.sh index eb40ebe3..8a189721 100755 --- a/Scripts/Generic_Deblob.sh +++ b/Scripts/Generic_Deblob.sh @@ -9,6 +9,7 @@ #Device Status (Tested under LineageOS 14.1) # #Functioning as Expected: bacon, clark, mako +#Not booting: thor base="/mnt/Drive-1/Development/Other/Android_ROMs/Build/LineageOS-14.1/"; export base; @@ -48,8 +49,8 @@ export base; #Clearkey (DRM) [Google] blobs=$blobs"|libdrmclearkeyplugin.so"; - #CMN (DRM) [Unknown] - blobs=$blobs"|cmnlib.b00|cmnlib.b01|cmnlib.b02|cmnlib.b03|cmnlib.b04|cmnlib.b05|cmnlib.mdt|cmnlib64.b00|cmnlib64.b01|cmnlib64.b02|cmnlib64.b03|cmnlib64.b04|cmnlib64.b05|cmnlib64.mdt"; + #CMN (TrustZone?) [Qualcomm?] + #blobs=$blobs"|cmnlib.b00|cmnlib.b01|cmnlib.b02|cmnlib.b03|cmnlib.b04|cmnlib.b05|cmnlib.mdt|cmnlib64.b00|cmnlib64.b01|cmnlib64.b02|cmnlib64.b03|cmnlib64.b04|cmnlib64.b05|cmnlib64.mdt"; #CNE (Automatic Cell/Wi-Fi Switching) [Qualcomm] #blobs=$blobs"|libcneapiclient.so"; #XXX: Breaks radio @@ -76,7 +77,8 @@ export base; #DRM blobs=$blobs"|lib-sec-disp.so|libSecureUILib.so|libsecureui.so|libsecureuisvc_jni.so|libsecureui_svcsock.so"; - blobs=$blobs"|liboemcrypto.so|libpvr.so|librmp.so|libsi.so|libSSEPKCS11.so|libtzdrmgenprov.so"; + blobs=$blobs"|liboemcrypto.so|libSSEPKCS11.so|libtzdrmgenprov.so"; + blobs=$blobs"|libpvr.so|librmp.so|libsi.so"; #Face Unlock [Google] blobs=$blobs"|libfacenet.so|libfilterpack_facedetect.so|libfrsdk.so"; @@ -201,7 +203,7 @@ deblobDevice() { fi; 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/LAOS-14.1_Patches.sh b/Scripts/LAOS-14.1_Patches.sh index d27bdb80..50b7485d 100755 --- a/Scripts/LAOS-14.1_Patches.sh +++ b/Scripts/LAOS-14.1_Patches.sh @@ -157,8 +157,8 @@ cat /tmp/ar/hosts >> rootdir/etc/hosts #Merge in our HOSTS file patch -p1 < $patches"android_system_core/0001-Harden_Mounts.patch" #Harden mounts with nodev/noexec/nosuid #patch -p1 < $patches"android_system_core/0002-Harden_Network.patch" #Harden network via sysctls -#enter "system/netd" -#patch -p1 < $patches"android_system_netd/0001-Harden_Network.patch"; #Harden network via iptables +enter "system/netd" +patch -p1 < $patches"android_system_netd/0001-Harden_Network.patch"; #Harden network via iptables enter "vendor/cm" awk -i inplace '!/50-cm.sh/' config/common.mk; #Make sure our hosts is always used