| author | Tellen Yu <tellen.yu@amlogic.com> | 2020-11-11 10:24:36 (GMT) |
|---|---|---|
| committer | Tellen Yu <tellen.yu@amlogic.com> | 2020-11-12 10:53:32 (GMT) |
| commit | bf6a1bde47732629922d162d70583d77c973eabe (patch) | |
| tree | 8e717c9090406b1a463787e29fad0337ebcb798c | |
| parent | 81331a1bbc6ffaa65f3dd77f06c76d934591e552 (diff) | |
| download | common-bf6a1bde47732629922d162d70583d77c973eabe.zip common-bf6a1bde47732629922d162d70583d77c973eabe.tar.gz common-bf6a1bde47732629922d162d70583d77c973eabe.tar.bz2 | |
hidl: change some hidl services to aidl [1/2]
PD#SWPL-36778
Problem:
For new launch devices on Android 11, some HIDL
services are changed to AIDL service, but our
manifest is still using HIDL, so these services
will crash when boot system.
Solution:
change the hidl service manifest definition to
aidl service.
Verify:
ohm
Change-Id: I9da138284674b53208739b19e582858497ee2d93
| -rwxr-xr-x[-rw-r--r--] | core_amlogic.mk | 9 | ||||
| -rwxr-xr-x[-rw-r--r--] | hidl_manifests/newdevices/manifest_common.xml | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/core_amlogic.mk b/core_amlogic.mk index b6940a2..a8055cb 100644..100755 --- a/core_amlogic.mk +++ b/core_amlogic.mk @@ -410,9 +410,13 @@ PRODUCT_PACKAGES += \ android.hardware.gatekeeper@1.0-service.software #DRM HAL +ifeq ($(TARGET_BUILD_KERNEL_4_9),true) PRODUCT_PACKAGES += \ android.hardware.drm@1.0-impl \ - android.hardware.drm@1.0-service \ + android.hardware.drm@1.0-service +endif + +PRODUCT_PACKAGES += \ android.hardware.drm@1.3-service.widevine \ android.hardware.drm@1.3-service.clearkey \ move_widevine_data.sh @@ -427,10 +431,13 @@ PRODUCT_PACKAGES += \ vendor.amlogic.hardware.hdmicec@1.0 \ hdmi_cec.amlogic +#Android new device will use AIDL to instead of HIDL +ifeq ($(TARGET_BUILD_KERNEL_4_9),true) #light hal PRODUCT_PACKAGES += \ android.hardware.light@2.0-impl \ android.hardware.light@2.0-service +endif #usb gadget hal PRODUCT_PACKAGES += \ diff --git a/hidl_manifests/newdevices/manifest_common.xml b/hidl_manifests/newdevices/manifest_common.xml index d584b75..76b2d97 100644..100755 --- a/hidl_manifests/newdevices/manifest_common.xml +++ b/hidl_manifests/newdevices/manifest_common.xml @@ -135,14 +135,6 @@ </interface> </hal> <hal format="hidl"> - <name>android.hardware.light</name> - <transport>hwbinder</transport> - <interface> - <name>ILight</name> - <instance>default</instance> - </interface> - </hal> - <hal format="hidl"> <name>android.hardware.health</name> <transport>hwbinder</transport> <version>2.1</version> |