diff options
| author | Edwin Wong <edwinwong@google.com> | 2018-03-21 17:38:20 -0700 |
|---|---|---|
| committer | Edwin Wong <edwinwong@google.com> | 2018-03-31 00:19:54 +0000 |
| commit | e3894648febfd3a9fee500747f06b9f704ba1986 (patch) | |
| tree | d705e0b661ea285646d66c9f0a8409fc9f7942da | |
| parent | 0e8c276eb30c2ca9a00ebbbca50210b8083f1f4a (diff) | |
| download | device_google_wahoo-e3894648febfd3a9fee500747f06b9f704ba1986.tar.gz device_google_wahoo-e3894648febfd3a9fee500747f06b9f704ba1986.tar.bz2 device_google_wahoo-e3894648febfd3a9fee500747f06b9f704ba1986.zip | |
Rename Widevine HIDL service to v1.1.
Widevine HIDL service added new v1.1 media APIs,
the service version is updated to 1.1.
Test: Netflix and Play Movies & TV (streaming and offline playback)
Test: GTS WidevineH264PlaybackTests test
e.g. ANDROID_BUILD_TOP= ./android-gts/toolsefed run gts -m GtsMediaTestCases
--test com.google.android.media.gts.WidevineH264PlaybackTests#testL1With480P30
bug: 69674645
Change-Id: I287d48bf7cef5b3bb30e21b3794cc7422701ca6c
| -rw-r--r-- | CleanSpec.mk | 7 | ||||
| -rwxr-xr-x | device.mk | 2 | ||||
| -rw-r--r-- | manifest.xml | 4 | ||||
| -rw-r--r-- | sepolicy/vendor/file_contexts | 2 | ||||
| -rw-r--r-- | sepolicy/vendor/hal_drm_widevine.te | 2 |
5 files changed, 12 insertions, 5 deletions
diff --git a/CleanSpec.mk b/CleanSpec.mk index 7f0654ab..f735633e 100644 --- a/CleanSpec.mk +++ b/CleanSpec.mk @@ -176,3 +176,10 @@ $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib64/hw/*) # Remove android.hardware.audio*@2.0 implementation $(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/lib/hw/android.hardware.audio*@2.0-impl.so) +# Remove Clearkey HAL 1.0 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.drm@1.0-service.clearkey.rc) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.drm@1.0-service.clearkey) + +# Remove Widevine HAL 1.0 +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/etc/init/android.hardware.drm@1.0-service.widevine.rc) +$(call add-clean-step, rm -rf $(PRODUCT_OUT)/vendor/bin/hw/android.hardware.drm@1.0-service.widevine) @@ -339,7 +339,7 @@ PRODUCT_PROPERTY_OVERRIDES += \ PRODUCT_PACKAGES += \ android.hardware.drm@1.0-impl:32 \ android.hardware.drm@1.0-service \ - android.hardware.drm@1.0-service.widevine \ + android.hardware.drm@1.1-service.widevine \ android.hardware.drm@1.1-service.clearkey \ move_widevine_data.sh diff --git a/manifest.xml b/manifest.xml index a64c9a56..cb4066fe 100644 --- a/manifest.xml +++ b/manifest.xml @@ -87,15 +87,15 @@ <interface> <name>ICryptoFactory</name> <instance>default</instance> - <instance>widevine</instance> </interface> <interface> <name>IDrmFactory</name> <instance>default</instance> - <instance>widevine</instance> </interface> <fqname>@1.1::ICryptoFactory/clearkey</fqname> <fqname>@1.1::IDrmFactory/clearkey</fqname> + <fqname>@1.1::ICryptoFactory/widevine</fqname> + <fqname>@1.1::IDrmFactory/widevine</fqname> </hal> <hal format="hidl"> <name>android.hardware.dumpstate</name> diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index ddca8dec..02f1244e 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -184,7 +184,7 @@ /vendor/bin/init\.radio\.sh u:object_r:init_radio_exec:s0 /vendor/bin/hw/android\.hardware\.bluetooth@1\.0-service-qti u:object_r:hal_bluetooth_default_exec:s0 -/vendor/bin/hw/android\.hardware\.drm@1\.0-service\.widevine u:object_r:hal_drm_widevine_exec:s0 +/vendor/bin/hw/android\.hardware\.drm@1\.1-service\.widevine u:object_r:hal_drm_widevine_exec:s0 /vendor/bin/hw/android\.hardware\.drm@1\.1-service\.clearkey u:object_r:hal_drm_clearkey_exec:s0 /vendor/bin/hw/android\.hardware\.vibrator@1\.2-service\.wahoo u:object_r:hal_vibrator_default_exec:s0 /vendor/bin/hw/android\.hardware\.health@2\.0-service\.wahoo u:object_r:hal_health_default_exec:s0 diff --git a/sepolicy/vendor/hal_drm_widevine.te b/sepolicy/vendor/hal_drm_widevine.te index a8750c6c..f2725022 100644 --- a/sepolicy/vendor/hal_drm_widevine.te +++ b/sepolicy/vendor/hal_drm_widevine.te @@ -1,4 +1,4 @@ -# policy for /vendor/bin/hw/android.hardware.drm@1.0-service.widevine +# policy for /vendor/bin/hw/android.hardware.drm@1.1-service.widevine type hal_drm_widevine, domain; type hal_drm_widevine_exec, exec_type, vendor_file_type, file_type; |