From 532f93a17abc43df242820934a654e2e87faf651 Mon Sep 17 00:00:00 2001 From: Atrate Date: Fri, 27 Nov 2020 13:09:30 +0100 Subject: [PATCH 1/9] Add several more DRM-related files (thanks to DVOS) Signed-off-by: Atrate --- CHANGELOG | 12 ++++++++++++ README.md | 9 +++++++-- customize.sh | 2 +- module.prop | 4 ++-- system/vendor/lib64/lib-sec-disp.so | 0 system/vendor/lib64/libSecureUILib.so | 0 system/vendor/lib64/libsecureui.so | 0 system/vendor/lib64/libsecureui_svcsock.so | 0 8 files changed, 22 insertions(+), 5 deletions(-) create mode 100644 system/vendor/lib64/lib-sec-disp.so create mode 100644 system/vendor/lib64/libSecureUILib.so create mode 100644 system/vendor/lib64/libsecureui.so create mode 100644 system/vendor/lib64/libsecureui_svcsock.so diff --git a/CHANGELOG b/CHANGELOG index 8152b5e..53815ee 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,15 @@ +v1.3.0 +Added several DRM-related files +``` +/system/vendor/lib64/lib-sec-disp.so +/system/vendor/lib64/libSecureUILib.so +/system/vendor/lib64/libsecureui.so +/system/vendor/lib64/libsecureui_svcsock.so +/system/vendor/lib/liboemcrypto.so +``` + +--- + v1.2.0 Added another DRM-related file (CAS) diff --git a/README.md b/README.md index 5baddef..9bf3043 100644 --- a/README.md +++ b/README.md @@ -81,8 +81,13 @@ system │   ├── android.hardware.drm@1.2-service.clearkey* │   ├── android.hardware.drm@1.2-service.widevine* │   └── vendor.oneplus.hardware.drmkey@1.0-service* - └── lib/ - └── liboemcrypto.so + ├── lib/ + │   └── liboemcrypto.so + └── lib64/ + ├── lib-sec-disp.so + ├── libSecureUILib.so + ├── libsecureui.so + └── libsecureui_svcsock.so ``` **List of directories replaced in FULL mode:** diff --git a/customize.sh b/customize.sh index 43e4392..5704fc4 100755 --- a/customize.sh +++ b/customize.sh @@ -57,7 +57,7 @@ if "$FUNC"; then ui_print "Selected: LIGHT mode" # find "$MODPATH/system" -mindepth 1 ! -regex '^'"$MODPATH"'/system/bin\(/.*\)?' ! -regex '^'"$MODPATH"'/system/vendor/lib\(/.*\)?' -delete 2>/dev/null # The above would be a "smart" way of doing what's going to be done below. It is unreliable, though, since the find binary in Android seems to be very old. - rm -r "$MODPATH/system/etc" "$MODPATH/system/bin" "$MODPATH/system/framework" "$MODPATH/system/lib" "$MODPATH/system/lib64" + rm -r "$MODPATH/system/etc" "$MODPATH/system/bin" "$MODPATH/system/framework" "$MODPATH/system/lib" "$MODPATH/system/lib64" "$MODPATH/system/vendor/lib64" REPLACE=" /system/app/LGDrm /system/etc/drm diff --git a/module.prop b/module.prop index b7528b9..95b6ce2 100644 --- a/module.prop +++ b/module.prop @@ -1,7 +1,7 @@ id=magisk-drm-disabler name=Magisk DRM Disabler (MDD) -version=v1.2.0 -versionCode=120 +version=v1.3.0-rc1 +versionCode=130 author=Atrate description=A Magisk Module aiming to eliminate DRM from Android systemlessly. support=https://gitlab.com/Atrate/magisk-drm-disabler diff --git a/system/vendor/lib64/lib-sec-disp.so b/system/vendor/lib64/lib-sec-disp.so new file mode 100644 index 0000000..e69de29 diff --git a/system/vendor/lib64/libSecureUILib.so b/system/vendor/lib64/libSecureUILib.so new file mode 100644 index 0000000..e69de29 diff --git a/system/vendor/lib64/libsecureui.so b/system/vendor/lib64/libsecureui.so new file mode 100644 index 0000000..e69de29 diff --git a/system/vendor/lib64/libsecureui_svcsock.so b/system/vendor/lib64/libsecureui_svcsock.so new file mode 100644 index 0000000..e69de29 From 3cc0b88df5247b1bc3f5abf6ff09c99573e17d95 Mon Sep 17 00:00:00 2001 From: Atrate Date: Fri, 27 Nov 2020 13:11:08 +0100 Subject: [PATCH 2/9] Update CONTRIBUTING.md Signed-off-by: Atrate --- CONTRIBUTING.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 16aaffc..54c86f4 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -27,7 +27,7 @@ If you're interested in becoming a tester, please send me an e-mail or PM with y If trying to remove DRM libs, please remember that some libraries relate to Digital Restrictions Management while some refer to Direct Rendering Management. Removing the latter will cause graphics breakages through the whole system and possibly bootloops. -## Libraries that have been tested and cause a bootloop: +## Libraries that have been tested and cause a bootloop (remember the above notice — Rendering vs Restrictions): ``` android.hardware.drm@1.0.so android.hardware.drm@1.1.so From 5e5bf04d4bd235c0588534fee2dcc1f7991f218a Mon Sep 17 00:00:00 2001 From: Atrate Date: Mon, 30 Nov 2020 17:06:08 +0100 Subject: [PATCH 3/9] Add a couple more DRM libraries to remove Signed-off-by: Atrate --- README.md | 5 ++++- customize.sh | 2 +- system/vendor/lib/libmm-hdcpmgr.so | 0 system/vendor/lib/libwvhidl.so | 0 system/vendor/lib64/libmm-hdcpmgr.so | 0 5 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 system/vendor/lib/libmm-hdcpmgr.so create mode 100644 system/vendor/lib/libwvhidl.so create mode 100644 system/vendor/lib64/libmm-hdcpmgr.so diff --git a/README.md b/README.md index 9bf3043..f30b7be 100644 --- a/README.md +++ b/README.md @@ -82,8 +82,11 @@ system │   ├── android.hardware.drm@1.2-service.widevine* │   └── vendor.oneplus.hardware.drmkey@1.0-service* ├── lib/ - │   └── liboemcrypto.so + │   ├── libmm-hdcpmgr.so + │   ├── liboemcrypto.so + │   └── libwvhidl.so └── lib64/ + ├── libmm-hdcpmgr.so ├── lib-sec-disp.so ├── libSecureUILib.so ├── libsecureui.so diff --git a/customize.sh b/customize.sh index 5704fc4..8df4aa5 100755 --- a/customize.sh +++ b/customize.sh @@ -57,7 +57,7 @@ if "$FUNC"; then ui_print "Selected: LIGHT mode" # find "$MODPATH/system" -mindepth 1 ! -regex '^'"$MODPATH"'/system/bin\(/.*\)?' ! -regex '^'"$MODPATH"'/system/vendor/lib\(/.*\)?' -delete 2>/dev/null # The above would be a "smart" way of doing what's going to be done below. It is unreliable, though, since the find binary in Android seems to be very old. - rm -r "$MODPATH/system/etc" "$MODPATH/system/bin" "$MODPATH/system/framework" "$MODPATH/system/lib" "$MODPATH/system/lib64" "$MODPATH/system/vendor/lib64" + rm -r "$MODPATH/system/etc" "$MODPATH/system/bin" "$MODPATH/system/framework" "$MODPATH/system/lib" "$MODPATH/system/lib64" "$MODPATH/system/vendor/lib64" "$MODPATH/system/vendor/lib/libmm-hdcpmgr.so" "$MODPATH/system/vendor/lib/libwvhidl.so" REPLACE=" /system/app/LGDrm /system/etc/drm diff --git a/system/vendor/lib/libmm-hdcpmgr.so b/system/vendor/lib/libmm-hdcpmgr.so new file mode 100644 index 0000000..e69de29 diff --git a/system/vendor/lib/libwvhidl.so b/system/vendor/lib/libwvhidl.so new file mode 100644 index 0000000..e69de29 diff --git a/system/vendor/lib64/libmm-hdcpmgr.so b/system/vendor/lib64/libmm-hdcpmgr.so new file mode 100644 index 0000000..e69de29 From 748dc239e41ff09e9ca16a6aec594fd8a8a7b908 Mon Sep 17 00:00:00 2001 From: Atrate Date: Mon, 30 Nov 2020 17:19:19 +0100 Subject: [PATCH 4/9] Implement removal of DRM firmware blobs Signed-off-by: Atrate --- CONTRIBUTING.md | 10 +++++++++- README.md | 18 ++++++++++++++++++ system/etc/firmware/dxhdcp2.b00 | 0 system/etc/firmware/dxhdcp2.b01 | 0 system/etc/firmware/dxhdcp2.b02 | 0 system/etc/firmware/dxhdcp2.b03 | 0 system/etc/firmware/dxhdcp2.b04 | 0 system/etc/firmware/dxhdcp2.b05 | 0 system/etc/firmware/dxhdcp2.b06 | 0 system/etc/firmware/dxhdcp2.mdt | 0 system/vendor/firmware/widevine.b00 | 0 system/vendor/firmware/widevine.b01 | 0 system/vendor/firmware/widevine.b02 | 0 system/vendor/firmware/widevine.b03 | 0 system/vendor/firmware/widevine.b04 | 0 system/vendor/firmware/widevine.b05 | 0 system/vendor/firmware/widevine.b06 | 0 system/vendor/firmware/widevine.mdt | 0 18 files changed, 27 insertions(+), 1 deletion(-) create mode 100644 system/etc/firmware/dxhdcp2.b00 create mode 100644 system/etc/firmware/dxhdcp2.b01 create mode 100644 system/etc/firmware/dxhdcp2.b02 create mode 100644 system/etc/firmware/dxhdcp2.b03 create mode 100644 system/etc/firmware/dxhdcp2.b04 create mode 100644 system/etc/firmware/dxhdcp2.b05 create mode 100644 system/etc/firmware/dxhdcp2.b06 create mode 100644 system/etc/firmware/dxhdcp2.mdt create mode 100644 system/vendor/firmware/widevine.b00 create mode 100644 system/vendor/firmware/widevine.b01 create mode 100644 system/vendor/firmware/widevine.b02 create mode 100644 system/vendor/firmware/widevine.b03 create mode 100644 system/vendor/firmware/widevine.b04 create mode 100644 system/vendor/firmware/widevine.b05 create mode 100644 system/vendor/firmware/widevine.b06 create mode 100644 system/vendor/firmware/widevine.mdt diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index 54c86f4..a00a7e8 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -38,10 +38,18 @@ libmediardm.so libmediardmmetrics_lite.so ``` -Files used for DRM that cannot yet be replaced: +These DRM-related files cannot be natively replaced. Instead, the symlinks pointing to them are replaced in `/system/etc/firmware` and `/system/vendor/firmware`. ``` firmware └── image/ + ├── dxhdcp2.b00 + ├── dxhdcp2.b01 + ├── dxhdcp2.b02 + ├── dxhdcp2.b03 + ├── dxhdcp2.b04 + ├── dxhdcp2.b05 + ├── dxhdcp2.b06 + ├── dxhdcp2.mdt ├── widevine.b01* ├── widevine.b02* ├── widevine.b03* diff --git a/README.md b/README.md index f30b7be..9a08711 100644 --- a/README.md +++ b/README.md @@ -50,6 +50,15 @@ system │   ├── lgdrmserver* │   └── mediadrmserver* ├── etc/ +│   ├── firmware/ +│   │   ├── dxhdcp2.b00 +│   │   ├── dxhdcp2.b01 +│   │   ├── dxhdcp2.b02 +│   │   ├── dxhdcp2.b03 +│   │   ├── dxhdcp2.b04 +│   │   ├── dxhdcp2.b05 +│   │   ├── dxhdcp2.b06 +│   │   └── dxhdcp2.mdt │   ├── init/ │   │   ├── drmserver.rc* │   │   └── mediardmserver.rc* @@ -81,6 +90,15 @@ system │   ├── android.hardware.drm@1.2-service.clearkey* │   ├── android.hardware.drm@1.2-service.widevine* │   └── vendor.oneplus.hardware.drmkey@1.0-service* + ├── firmware/ + │   ├── widevine.b00 + │   ├── widevine.b01 + │   ├── widevine.b02 + │   ├── widevine.b03 + │   ├── widevine.b04 + │   ├── widevine.b05 + │   ├── widevine.b06 + │   └── widevine.mdt ├── lib/ │   ├── libmm-hdcpmgr.so │   ├── liboemcrypto.so diff --git a/system/etc/firmware/dxhdcp2.b00 b/system/etc/firmware/dxhdcp2.b00 new file mode 100644 index 0000000..e69de29 diff --git a/system/etc/firmware/dxhdcp2.b01 b/system/etc/firmware/dxhdcp2.b01 new file mode 100644 index 0000000..e69de29 diff --git a/system/etc/firmware/dxhdcp2.b02 b/system/etc/firmware/dxhdcp2.b02 new file mode 100644 index 0000000..e69de29 diff --git a/system/etc/firmware/dxhdcp2.b03 b/system/etc/firmware/dxhdcp2.b03 new file mode 100644 index 0000000..e69de29 diff --git a/system/etc/firmware/dxhdcp2.b04 b/system/etc/firmware/dxhdcp2.b04 new file mode 100644 index 0000000..e69de29 diff --git a/system/etc/firmware/dxhdcp2.b05 b/system/etc/firmware/dxhdcp2.b05 new file mode 100644 index 0000000..e69de29 diff --git a/system/etc/firmware/dxhdcp2.b06 b/system/etc/firmware/dxhdcp2.b06 new file mode 100644 index 0000000..e69de29 diff --git a/system/etc/firmware/dxhdcp2.mdt b/system/etc/firmware/dxhdcp2.mdt new file mode 100644 index 0000000..e69de29 diff --git a/system/vendor/firmware/widevine.b00 b/system/vendor/firmware/widevine.b00 new file mode 100644 index 0000000..e69de29 diff --git a/system/vendor/firmware/widevine.b01 b/system/vendor/firmware/widevine.b01 new file mode 100644 index 0000000..e69de29 diff --git a/system/vendor/firmware/widevine.b02 b/system/vendor/firmware/widevine.b02 new file mode 100644 index 0000000..e69de29 diff --git a/system/vendor/firmware/widevine.b03 b/system/vendor/firmware/widevine.b03 new file mode 100644 index 0000000..e69de29 diff --git a/system/vendor/firmware/widevine.b04 b/system/vendor/firmware/widevine.b04 new file mode 100644 index 0000000..e69de29 diff --git a/system/vendor/firmware/widevine.b05 b/system/vendor/firmware/widevine.b05 new file mode 100644 index 0000000..e69de29 diff --git a/system/vendor/firmware/widevine.b06 b/system/vendor/firmware/widevine.b06 new file mode 100644 index 0000000..e69de29 diff --git a/system/vendor/firmware/widevine.mdt b/system/vendor/firmware/widevine.mdt new file mode 100644 index 0000000..e69de29 From f617945841e25a1b517a3a9acbfbf139167a1f68 Mon Sep 17 00:00:00 2001 From: Atrate Date: Mon, 30 Nov 2020 17:21:30 +0100 Subject: [PATCH 5/9] Update CHANGELOG Signed-off-by: Atrate --- CHANGELOG | 28 ++++++++++++++++++++++++++-- 1 file changed, 26 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 53815ee..0f94f7e 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,11 +1,35 @@ v1.3.0 -Added several DRM-related files +Added several DRM-related files: ``` +/system/vendor/lib/libmm-hdcpmgr.so +/system/vendor/lib/liboemcrypto.so +/system/vendor/lib/libwvhidl.so /system/vendor/lib64/lib-sec-disp.so /system/vendor/lib64/libSecureUILib.so +/system/vendor/lib64/libmm-hdcpmgr.so /system/vendor/lib64/libsecureui.so /system/vendor/lib64/libsecureui_svcsock.so -/system/vendor/lib/liboemcrypto.so +``` + +Added firmware DRM blobs: +``` +/system/etc/firmware/dxhdcp2.b00 +/system/etc/firmware/dxhdcp2.b01 +/system/etc/firmware/dxhdcp2.b02 +/system/etc/firmware/dxhdcp2.b03 +/system/etc/firmware/dxhdcp2.b04 +/system/etc/firmware/dxhdcp2.b05 +/system/etc/firmware/dxhdcp2.b06 +/system/etc/firmware/dxhdcp2.mdt + +/system/vendor/firmware/widevine.b00 +/system/vendor/firmware/widevine.b01 +/system/vendor/firmware/widevine.b02 +/system/vendor/firmware/widevine.b03 +/system/vendor/firmware/widevine.b04 +/system/vendor/firmware/widevine.b05 +/system/vendor/firmware/widevine.b06 +/system/vendor/firmware/widevine.mdt ``` --- From bcc87edee6a6c75d596d3dbd21135bf9f959f844 Mon Sep 17 00:00:00 2001 From: Atrate Date: Mon, 30 Nov 2020 21:33:11 +0100 Subject: [PATCH 6/9] Hopefully fix bug report template for GitHub Signed-off-by: Atrate --- .github/ISSUE_TEMPLATE/{BUG_REPORT.md => bug_report.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .github/ISSUE_TEMPLATE/{BUG_REPORT.md => bug_report.md} (100%) diff --git a/.github/ISSUE_TEMPLATE/BUG_REPORT.md b/.github/ISSUE_TEMPLATE/bug_report.md similarity index 100% rename from .github/ISSUE_TEMPLATE/BUG_REPORT.md rename to .github/ISSUE_TEMPLATE/bug_report.md From ecd36bbe29db45a6ef795927ff4d67ed5bd10277 Mon Sep 17 00:00:00 2001 From: Atrate Date: Mon, 30 Nov 2020 21:37:55 +0100 Subject: [PATCH 7/9] Changelog should be a markdown file Signed-off-by: Atrate --- CHANGELOG => CHANGELOG.md | 0 README.md | 2 +- 2 files changed, 1 insertion(+), 1 deletion(-) rename CHANGELOG => CHANGELOG.md (100%) diff --git a/CHANGELOG b/CHANGELOG.md similarity index 100% rename from CHANGELOG rename to CHANGELOG.md diff --git a/README.md b/README.md index 9a08711..ee59f80 100644 --- a/README.md +++ b/README.md @@ -155,7 +155,7 @@ If you're interested in helping the project, please refer to [CONTRIBUTING.md](. - topjohnwu for Magisk; - Jman420 for [volume key input](https://github.com/Jman420/magisk_selinux_manager/blob/develop/common/install.sh). -## [Changelog](./CHANGELOG) +## [Changelog](./CHANGELOG.md) ## License This project is licensed under the [GPL-3.0-or-later](https://www.gnu.org/licenses/gpl-3.0.html). From 53f87786fabd45b6375e156d7977f0efd58865ec Mon Sep 17 00:00:00 2001 From: Atrate Date: Mon, 30 Nov 2020 21:42:05 +0100 Subject: [PATCH 8/9] Make issue template naming consistent Signed-off-by: Atrate --- .gitlab/issue_templates/{BUG_REPORT.md => bug_report.md} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename .gitlab/issue_templates/{BUG_REPORT.md => bug_report.md} (100%) diff --git a/.gitlab/issue_templates/BUG_REPORT.md b/.gitlab/issue_templates/bug_report.md similarity index 100% rename from .gitlab/issue_templates/BUG_REPORT.md rename to .gitlab/issue_templates/bug_report.md From 60b1c99fdc9799f53918c593f9e1130e7c1420a4 Mon Sep 17 00:00:00 2001 From: Atrate Date: Sun, 17 Jan 2021 14:31:11 +0100 Subject: [PATCH 9/9] Increment version Signed-off-by: Atrate --- module.prop | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/module.prop b/module.prop index 95b6ce2..97cd65a 100644 --- a/module.prop +++ b/module.prop @@ -1,6 +1,6 @@ id=magisk-drm-disabler name=Magisk DRM Disabler (MDD) -version=v1.3.0-rc1 +version=v1.3.0 versionCode=130 author=Atrate description=A Magisk Module aiming to eliminate DRM from Android systemlessly.