s5e8825-common: Kang AIDL DRM Widevine HAL from a54x

Change-Id: I1e7e1b6f8a22f1ae699f8627ac82269c68abab8f
Signed-off-by: Majaahh <maja.blaszczak@proton.me>

Android.bp

@@ -1747,7 +1747,7 @@ cc_prebuilt_library_shared {
 }
 
 cc_prebuilt_library_shared {
-    name: "libwvhidl",
+    name: "libwvaidl",
     owner: "samsung",
     strip: {
         none: true,
@@ -1755,22 +1755,16 @@ cc_prebuilt_library_shared {
     target: {
         android_arm64: {
             srcs: [
-                "proprietary/vendor/lib64/libwvhidl.so",
+                "proprietary/vendor/lib64/libwvaidl.so",
             ],
             shared_libs: [
-                "android.hardware.drm@1.0",
+                "android.hardware.drm-V1-ndk",
-                "android.hardware.drm@1.1",
-                "android.hardware.drm@1.2",
-                "android.hardware.drm@1.3",
-                "android.hardware.drm@1.4",
-                "android.hidl.memory@1.0",
                 "libbase",
+                "libbinder_ndk",
                 "libcrypto",
                 "libcutils",
-                "libhidlbase",
-                "libhidlmemory",
                 "liblog",
-                "libprotobuf-cpp-full-3.9.1-vendorcompat",
+                "libprotobuf-cpp-lite-3.9.1-vendorcompat",
                 "libutils",
                 "libc++",
                 "libc",
@@ -2271,9 +2265,9 @@ cc_prebuilt_library_shared {
 }
 
 prebuilt_etc_xml {
-    name: "manifest_android.hardware.drm@1.4-service.widevine.xml",
+    name: "manifest_android.hardware.drm-service.widevine.xml",
     owner: "samsung",
-    src: "proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.widevine.xml",
+    src: "proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm-service.widevine.xml",
     filename_from_src: true,
     sub_dir: "vintf/manifest",
     soc_specific: true,
@@ -2369,25 +2363,20 @@ cc_prebuilt_binary {
 }
 
 cc_prebuilt_binary {
-    name: "android.hardware.drm@1.4-service.widevine",
+    name: "android.hardware.drm-service.widevine",
     owner: "samsung",
     target: {
         android_arm64: {
             srcs: [
-                "proprietary/vendor/bin/hw/android.hardware.drm@1.4-service.widevine",
+                "proprietary/vendor/bin/hw/android.hardware.drm-service.widevine",
             ],
             shared_libs: [
-                "android.hardware.drm@1.0",
+                "android.hardware.drm-V1-ndk",
-                "android.hardware.drm@1.1",
-                "android.hardware.drm@1.2",
-                "android.hardware.drm@1.3",
                 "libbase",
-                "libhidlbase",
                 "liblog",
                 "libutils",
-                "libbinder",
+                "libwvaidl",
-                "android.hardware.drm@1.4",
+                "libbinder_ndk",
-                "libwvhidl",
                 "libc++",
                 "libc",
                 "libm",

proprietary/vendor/etc/init/android.hardware.drm-service.widevine.rc

@@ -0,0 +1,10 @@
+on property:init.svc.mediadrm=running
+    mkdir /data/vendor/mediadrm 0770 media mediadrm
+
+service vendor.drm-widevine-hal /vendor/bin/hw/android.hardware.drm-service.widevine
+    interface aidl android.hardware.drm::IDrmFactory/widevine
+    class hal
+    user media
+    group media mediadrm drmrpc system
+    ioprio rt 4
+    writepid /dev/cpuset/foreground/tasks

proprietary/vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc

@@ -1,28 +0,0 @@
-on property:init.svc.mediadrm=running
-    mkdir /data/vendor/mediadrm 0770 media mediadrm
-    start vendor.move_data_sh
-
-service vendor.move_data_sh /system/bin/move_widevine_data.sh
-    class late_start
-    user media
-    group media mediadrm system
-    disabled
-    oneshot
-
-service vendor.drm-widevine-hal-1-4 /vendor/bin/hw/android.hardware.drm@1.4-service.widevine
-    interface android.hardware.drm@1.0::ICryptoFactory widevine
-    interface android.hardware.drm@1.0::IDrmFactory widevine
-    interface android.hardware.drm@1.1::ICryptoFactory widevine
-    interface android.hardware.drm@1.1::IDrmFactory widevine
-    interface android.hardware.drm@1.2::ICryptoFactory widevine
-    interface android.hardware.drm@1.2::IDrmFactory widevine
-    interface android.hardware.drm@1.3::ICryptoFactory widevine
-    interface android.hardware.drm@1.3::IDrmFactory widevine
-    interface android.hardware.drm@1.4::ICryptoFactory widevine
-    interface android.hardware.drm@1.4::IDrmFactory widevine
-    interface android.hidl.base@1.0::IBase widevine
-    class hal
-    user media
-    group media mediadrm drmrpc system
-    ioprio rt 4
-    writepid /dev/cpuset/foreground/tasks

proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm-service.widevine.xml

@@ -14,10 +14,9 @@
      limitations under the License.
 -->
 <manifest version="1.0" type="device">
-    <hal format="hidl">
+    <hal format="aidl">
         <name>android.hardware.drm</name>
-        <transport>hwbinder</transport>
+        <version>1</version>
-        <fqname>@1.4::ICryptoFactory/widevine</fqname>
+        <fqname>IDrmFactory/widevine</fqname>
-        <fqname>@1.4::IDrmFactory/widevine</fqname>
     </hal>
 </manifest>

s5e8825-common-vendor.mk

@@ -15,7 +15,7 @@ PRODUCT_COPY_FILES += \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/epic.json:$(TARGET_COPY_OUT_VENDOR)/etc/epic.json \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/gnss/ca.pem:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/ca.pem \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/gnss/gps.cfg:$(TARGET_COPY_OUT_VENDOR)/etc/gnss/gps.cfg \
-    vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.4-service.widevine.rc \
+    vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/android.hardware.drm-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm-service.widevine.rc \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/android.hardware.security.keymint-service.samsung.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.security.keymint-service.samsung.rc \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/cass.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/cass.rc \
     vendor/samsung/s5e8825-common/proprietary/vendor/etc/init/init.gps.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.gps.rc \
@@ -120,7 +120,7 @@ PRODUCT_PACKAGES += \
     libuuid_vendor \
     libvkmanager_vendor \
     libwrappergps \
-    libwvhidl \
+    libwvaidl \
     sensors.grip \
     sensors.inputvirtual \
     sensors.sensorhub \
@@ -138,14 +138,14 @@ PRODUCT_PACKAGES += \
     vendor.samsung.hardware.radio.messaging-V1-ndk \
     vendor.samsung.hardware.radio.sim-V1-ndk \
     vendor.samsung.hardware.thermal@1.0 \
-    manifest_android.hardware.drm@1.4-service.widevine.xml \
+    manifest_android.hardware.drm-service.widevine.xml \
     secaudiohalaidl_manifest.xml \
     vendor.samsung.hardware.radio.exclude.slsi.xml \
     vendor.samsung.hardware.radio_manifest_2_33.xml \
     vendor.samsung.hardware.sehradio_manifest_2_33.xml \
     cass \
     epic \
-    android.hardware.drm@1.4-service.widevine \
+    android.hardware.drm-service.widevine \
     gps \
     gpsd \
     rild \