zenfone7: Drop HIDL ClearKey DRM HAL
build from sm8250-common
Change-Id: I21a07db055a4873f5899cb47554b9424b18f4bf3
diff --git a/proprietary-files-vendor.txt b/proprietary-files-vendor.txt
index 41b0d6b..6225baa 100644
--- a/proprietary-files-vendor.txt
+++ b/proprietary-files-vendor.txt
@@ -113,7 +113,6 @@
vendor/bin/hw/android.hardware.camera.provider@2.4-service_64
vendor/bin/hw/android.hardware.cas@1.2-service
vendor/bin/hw/android.hardware.configstore@1.1-service
-vendor/bin/hw/android.hardware.drm@1.3-service.clearkey
vendor/bin/hw/android.hardware.drm@1.3-service.widevine
vendor/bin/hw/android.hardware.gatekeeper@1.0-service-qti
vendor/bin/hw/android.hardware.gnss@2.1-service-qti
@@ -391,7 +390,6 @@
vendor/etc/init/android.hardware.camera.provider@2.4-service_64.rc
vendor/etc/init/android.hardware.cas@1.2-service.rc
vendor/etc/init/android.hardware.configstore@1.1-service.rc
-vendor/etc/init/android.hardware.drm@1.3-service.clearkey.rc
vendor/etc/init/android.hardware.drm@1.3-service.widevine.rc
vendor/etc/init/android.hardware.gatekeeper@1.0-service-qti.rc
vendor/etc/init/android.hardware.gnss@2.1-service-qti.rc
@@ -1058,7 +1056,6 @@
-vendor/etc/vintf/manifest/android.hardware.usb@1.2-service.xml
-vendor/etc/vintf/manifest/android.hardware.wifi.hostapd.xml
-vendor/etc/vintf/manifest/c2_manifest_vendor.xml
--vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.clearkey.xml
-vendor/etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml
-vendor/etc/vintf/manifest/power.xml
-vendor/etc/vintf/manifest/vendor.goodix.hardware.biometrics.fingerprint.xml
diff --git a/regen-vendor.sh b/regen-vendor.sh
index 99686e5..eac06b1 100755
--- a/regen-vendor.sh
+++ b/regen-vendor.sh
@@ -493,6 +493,11 @@
"lib/libsdmcore.so"
"lib/libsdmutils.so"
+ # DRM
+ "bin/hw/android.hardware.drm@1.3-service.clearkey"
+ "etc/init/android.hardware.drm@1.3-service.clearkey.rc"
+ "etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.clearkey.xml"
+
# Health
"bin/hw/android.hardware.health@2.1-service"
"etc/init/android.hardware.health@2.1-service.rc"
@@ -877,7 +882,6 @@
as_module "etc/vintf/manifest/android.hardware.usb@1.2-service.xml"
as_module "etc/vintf/manifest/android.hardware.wifi.hostapd.xml"
as_module "etc/vintf/manifest/c2_manifest_vendor.xml"
-as_module "etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.clearkey.xml"
as_module "etc/vintf/manifest/manifest_android.hardware.drm@1.3-service.widevine.xml"
as_module "etc/vintf/manifest/power.xml"
as_module "etc/vintf/manifest/vendor.goodix.hardware.biometrics.fingerprint.xml"