axolotl: drm: fixup widevine AIDL to HIDL revert
Change-Id: Ia11acf718e871181200579333649dad6c3335c8e
Signed-off-by: Alexander Martinz <amartinz@shiftphones.com>
diff --git a/axolotl-vendor.mk b/axolotl-vendor.mk
index f35252a..e99bbbe 100644
--- a/axolotl-vendor.mk
+++ b/axolotl-vendor.mk
@@ -1025,8 +1025,8 @@
PRODUCT_COPY_FILES += \
vendor/shift/axolotl/proprietary/vendor/bin/hw/android.hardware.drm@1.3-service.widevine:$(TARGET_COPY_OUT_VENDOR)/bin/hw/android.hardware.drm@1.3-service.widevine \
vendor/shift/axolotl/proprietary/vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/android.hardware.drm@1.3-service.widevine.rc \
- vendor/shift/axolotl/proprietary/vendor/lib/libwvhidl.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwvhidl.so \
- vendor/shift/axolotl/proprietary/vendor/lib64/libwvhidl.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwvhidl.so
+ vendor/shift/axolotl/proprietary/vendor/lib/libwvhidl@1.3.so:$(TARGET_COPY_OUT_VENDOR)/lib/libwvhidl@1.3.so \
+ vendor/shift/axolotl/proprietary/vendor/lib64/libwvhidl@1.3.so:$(TARGET_COPY_OUT_VENDOR)/lib64/libwvhidl@1.3.so
PRODUCT_PACKAGES += \
manifest_android.hardware.drm@1.3-service.widevine
diff --git a/proprietary/vendor/bin/hw/android.hardware.drm-service.widevine b/proprietary/vendor/bin/hw/android.hardware.drm-service.widevine
deleted file mode 100644
index 39995d9..0000000
--- a/proprietary/vendor/bin/hw/android.hardware.drm-service.widevine
+++ /dev/null
Binary files differ
diff --git a/proprietary/vendor/etc/init/android.hardware.drm-service.widevine.rc b/proprietary/vendor/etc/init/android.hardware.drm-service.widevine.rc
deleted file mode 100644
index 17f891b..0000000
--- a/proprietary/vendor/etc/init/android.hardware.drm-service.widevine.rc
+++ /dev/null
@@ -1,10 +0,0 @@
-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
diff --git a/proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm-service.widevine.xml b/proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm-service.widevine.xml
deleted file mode 100644
index 914783f..0000000
--- a/proprietary/vendor/etc/vintf/manifest/manifest_android.hardware.drm-service.widevine.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2021 The Android Open Source Project
-
- Licensed under the Apache License, Version 2.0 (the "License");
- you may not use this file except in compliance with the License.
- You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing, software
- distributed under the License is distributed on an "AS IS" BASIS,
- WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- See the License for the specific language governing permissions and
- limitations under the License.
--->
-<manifest version="1.0" type="device">
- <hal format="aidl">
- <name>android.hardware.drm</name>
- <version>1</version>
- <fqname>IDrmFactory/widevine</fqname>
- </hal>
-</manifest>
diff --git a/proprietary/vendor/lib/libwvhidl.so b/proprietary/vendor/lib/libwvhidl.so
deleted file mode 100644
index 0878b46..0000000
--- a/proprietary/vendor/lib/libwvhidl.so
+++ /dev/null
Binary files differ
diff --git a/proprietary/vendor/lib/libwvhidl@1.3.so b/proprietary/vendor/lib/libwvhidl@1.3.so
new file mode 100644
index 0000000..6a8c3a0
--- /dev/null
+++ b/proprietary/vendor/lib/libwvhidl@1.3.so
Binary files differ
diff --git a/proprietary/vendor/lib64/libwvaidl.so b/proprietary/vendor/lib64/libwvaidl.so
deleted file mode 100644
index b75b7ce..0000000
--- a/proprietary/vendor/lib64/libwvaidl.so
+++ /dev/null
Binary files differ
diff --git a/proprietary/vendor/lib64/libwvhidl.so b/proprietary/vendor/lib64/libwvhidl.so
deleted file mode 100644
index 9fafb3e..0000000
--- a/proprietary/vendor/lib64/libwvhidl.so
+++ /dev/null
Binary files differ
diff --git a/proprietary/vendor/lib64/libwvhidl@1.3.so b/proprietary/vendor/lib64/libwvhidl@1.3.so
new file mode 100644
index 0000000..ef54121
--- /dev/null
+++ b/proprietary/vendor/lib64/libwvhidl@1.3.so
Binary files differ