zenfone8: Switch to android.hardware.drm-service.clearkey aidl
and android.hardware.drm@1.4 to vendor
Change-Id: I12db2e4545d7c17ac4b7d4df26b28d2f1809963a
diff --git a/device.mk b/device.mk
index a08adb4..eafc3f1 100755
--- a/device.mk
+++ b/device.mk
@@ -149,7 +149,8 @@
# DRM
PRODUCT_PACKAGES += \
- android.hardware.drm@1.4-service.clearkey
+ android.hardware.drm@1.4.vendor \
+ android.hardware.drm-service.clearkey
# fastbootd
PRODUCT_PACKAGES += \
diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index 6980e82..98be86c 100644
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -113,7 +113,6 @@
vendor/bin/hdcp2p2prov
vendor/bin/hw/android.hardware.audio.service_64
vendor/bin/hw/android.hardware.bluetooth@1.0-service-qti
-vendor/bin/hw/android.hardware.drm@1.4-service.clearkey
vendor/bin/hw/android.hardware.drm@1.4-service.widevine
vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti
vendor/bin/hw/android.hardware.gnss-aidl-service-qti
@@ -450,7 +449,6 @@
vendor/etc/init/android.hardware.audio.service_64.rc
vendor/etc/init/android.hardware.bluetooth@1.0-service-qti.rc
vendor/etc/init/android.hardware.drm@1.1-service.wfdhdcp.rc
-vendor/etc/init/android.hardware.drm@1.4-service.clearkey.rc
vendor/etc/init/android.hardware.drm@1.4-service.widevine.rc
vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc
vendor/etc/init/android.hardware.gnss-aidl-service-qti.rc
@@ -1152,7 +1150,6 @@
-vendor/etc/vintf/manifest/c2_manifest_vendor.xml
-vendor/etc/vintf/manifest/c2_manifest_vendor_audio.xml
-vendor/etc/vintf/manifest/dataconnection-saidl.xml
--vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.clearkey.xml
-vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.widevine.xml
-vendor/etc/vintf/manifest/manifest_lahaina_identity.xml
-vendor/etc/vintf/manifest/manifest_non_qmaa.xml
diff --git a/regen-vendor.sh b/regen-vendor.sh
index e175d58..475c053 100755
--- a/regen-vendor.sh
+++ b/regen-vendor.sh
@@ -833,9 +833,12 @@
"etc/init/android.hardware.atrace@1.0-service.rc"
"etc/vintf/manifest/android.hardware.atrace@1.0-service.xml"
"bin/hw/android.hardware.drm@1.3-service.clearkey"
+ "bin/hw/android.hardware.drm@1.4-service.clearkey"
"bin/hw/android.hardware.health@2.1-service"
"etc/init/android.hardware.health@2.1-service.rc"
+ "etc/init/android.hardware.drm@1.4-service.clearkey.rc"
"etc/vintf/manifest/android.hardware.health@2.1.xml"
+ "etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.clearkey.xml"
"lib/hw/android.hardware.health@2.0-impl-2.1-qti.so"
"lib64/hw/android.hardware.health@2.0-impl-2.1-qti.so"
"lib/mediacas/libclearkeycasplugin.so"
@@ -1174,7 +1177,6 @@
as_module "etc/vintf/manifest/android.hardware.wifi.supplicant.xml"
as_module "etc/vintf/manifest/c2_manifest_vendor_audio.xml"
as_module "etc/vintf/manifest/dataconnection-saidl.xml"
-as_module "etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.clearkey.xml"
as_module "etc/vintf/manifest/manifest_android.hardware.drm@1.4-service.widevine.xml"
as_module "etc/vintf/manifest/manifest_lahaina_identity.xml"
as_module "etc/vintf/manifest/manifest_non_qmaa.xml"