Merge branch 'b/v1.3.0' into 'master'

v1.3.0

See merge request Atrate/magisk-drm-disabler!5

CHANGELOG → CHANGELOG.md

@@ -1,3 +1,39 @@
+v1.3.0
+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
+```
+
+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
+```
+
+---
+
 v1.2.0
 Added another DRM-related file (CAS)
 

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):
 ```
 [email protected]
 [email protected]
@@ -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*

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,8 +90,25 @@ system
     │       ├── [email protected]*
     │       ├── [email protected]*
     │       └── [email protected]*
-    └── lib/
-        └── liboemcrypto.so
+    ├── firmware/
+    │   ├── widevine.b00
+    │   ├── widevine.b01
+    │   ├── widevine.b02
+    │   ├── widevine.b03
+    │   ├── widevine.b04
+    │   ├── widevine.b05
+    │   ├── widevine.b06
+    │   └── widevine.mdt
+    ├── lib/
+    │   ├── libmm-hdcpmgr.so
+    │   ├── liboemcrypto.so
+    │   └── libwvhidl.so
+    └── lib64/
+        ├── libmm-hdcpmgr.so
+        ├── lib-sec-disp.so
+        ├── libSecureUILib.so
+        ├── libsecureui.so
+        └── libsecureui_svcsock.so
 ```
 
 **List of directories replaced in FULL mode:**
@@ -129,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).

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" "$MODPATH/system/vendor/lib/libmm-hdcpmgr.so" "$MODPATH/system/vendor/lib/libwvhidl.so"
     REPLACE="
     /system/app/LGDrm
     /system/etc/drm

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
+versionCode=130
 author=Atrate
 description=A Magisk Module aiming to eliminate DRM from Android systemlessly.
 support=https://gitlab.com/Atrate/magisk-drm-disabler