From d41f7f93a0acf6184c6892c3f39d0c1e667cfb67 Mon Sep 17 00:00:00 2001 From: Tad Date: Sun, 19 Mar 2017 13:19:51 -0400 Subject: [PATCH] Remove another blob and remove an unused patch --- .../0001-Update_Build_Tools.patch | 25 ------------------- Scripts/Generic_Deblob.sh | 4 +-- Scripts/LAOS-14.1_Patches.sh | 1 - 3 files changed, 2 insertions(+), 28 deletions(-) delete mode 100644 Patches/LineageOS-14.1/android_packages_apps_FDroidPrivilegedExtension/0001-Update_Build_Tools.patch diff --git a/Patches/LineageOS-14.1/android_packages_apps_FDroidPrivilegedExtension/0001-Update_Build_Tools.patch b/Patches/LineageOS-14.1/android_packages_apps_FDroidPrivilegedExtension/0001-Update_Build_Tools.patch deleted file mode 100644 index 404be1d3..00000000 --- a/Patches/LineageOS-14.1/android_packages_apps_FDroidPrivilegedExtension/0001-Update_Build_Tools.patch +++ /dev/null @@ -1,25 +0,0 @@ -From bb788ab88084c09a34444f3e12d4f6cd1cc7398b Mon Sep 17 00:00:00 2001 -From: Tad -Date: Sun, 18 Dec 2016 17:38:28 -0500 -Subject: [PATCH] Update build tools - ---- - app/build.gradle | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/app/build.gradle b/app/build.gradle -index cbba2e6..88b97c7 100644 ---- a/app/build.gradle -+++ b/app/build.gradle -@@ -36,7 +36,7 @@ dependencies { - - android { - compileSdkVersion 24 -- buildToolsVersion '24.0.1' -+ buildToolsVersion '25.0.1' - - defaultConfig { - archivesBaseName = "FDroidPrivilegedExtension" --- -2.9.3 - diff --git a/Scripts/Generic_Deblob.sh b/Scripts/Generic_Deblob.sh index 0e738420..8c1fffb0 100755 --- a/Scripts/Generic_Deblob.sh +++ b/Scripts/Generic_Deblob.sh @@ -100,7 +100,7 @@ export base; blobs=$blobs"|libjni_latinime.so|libuiblur.so|libwifiscanner.so"; #Motorola - blobs=$blobs"|AppDirectedSMSProxy.apk|BuaContactAdapter.apk|batt_health|com.motorola.DirectedSMSProxy.xml|com.motorola.motosignature.jar|com.motorola.motosignature.xml|com.motorola.camera.xml|com.motorola.gallery.xml|com.motorola.triggerenroll.xml|MotoSignatureApp.apk|TriggerEnroll.apk|TriggerTrainingService.apk"; + blobs=$blobs"|AppDirectedSMSProxy.apk|BuaContactAdapter.apk|batt_health|com.motorola.DirectedSMSProxy.xml|com.motorola.motosignature.jar|com.motorola.motosignature.xml|com.motorola.camera.xml|com.motorola.gallery.xml|com.motorola.triggerenroll.xml|MotoDisplayFWProxy.apk|MotoSignatureApp.apk|TriggerEnroll.apk|TriggerTrainingService.apk"; #Performance Profiles #blobs=$blobs"|libqc-opt.so|libqti-perfd-client.so|mpdecision|msm_irqbalance|perfd|perf-profile0.conf|perf-profile1.conf|perf-profile2.conf|perf-profile3.conf|perf-profile4.conf|perf-profile5.conf"; @@ -186,7 +186,7 @@ echo "vendor/lib/libcneapiclient.so" >> device/oneplus/bacon/proprietary-files-q find device -maxdepth 2 -mindepth 2 -type d -exec bash -c 'deblobDevice "$0"' {} \; #Deblob all device directories find vendor -name "*vendor*.mk" -type f -exec bash -c 'deblobVendor "$0"' {} \; #Deblob all makefiles deblobVendors; #Deblob entire vendor directory -rm -rf frameworks/av/drm/mediadrm/plugins/clearkey; #Remove Clearkey (DRM) +rm -rf frameworks/av/drm/mediadrm/plugins/clearkey; #Remove Clearkey # #END OF DEBLOBBING # diff --git a/Scripts/LAOS-14.1_Patches.sh b/Scripts/LAOS-14.1_Patches.sh index b79efa68..04688469 100755 --- a/Scripts/LAOS-14.1_Patches.sh +++ b/Scripts/LAOS-14.1_Patches.sh @@ -75,7 +75,6 @@ patch -p1 < $patches"android_packages_apps_FDroid/0001.patch" #Enable privigled patch -p1 < $patches"android_packages_apps_FDroid/0003.patch" #Hide app updates for apps that are installed to /system enter "packages/apps/FDroidPrivilegedExtension" -patch -p1 < $patches"android_packages_apps_FDroidPrivilegedExtension/0001-Update_Build_Tools.patch" #Update build tools patch -p1 < $patches"android_packages_apps_FDroidPrivilegedExtension/0002-Release_Key.patch" #Change to release key #patch -p1 < $patches"android_packages_apps_FDroidPrivilegedExtension/0003-Test_Keys.patch" #Add test-keys XXX: ONLY USE FOR TEST BUILDS #release-keys: CB:1E:E2:EC:40:D0:5E:D6:78:F4:2A:E7:01:CD:FA:29:EE:A7:9D:0E:6D:63:32:76:DE:23:0B:F3:49:40:67:C3