hdmi: cec: convert to apex

device.mk

@@ -138,7 +138,7 @@ PRODUCT_COPY_FILES += \
 
 # CEC
 PRODUCT_PACKAGES += \
-    android.hardware.tv.hdmi.cec-service.rpi \
+    com.android.hardware.tv.hdmi.cec.rpi4 \
     android.hardware.tv.hdmi.connection-service.rpi
 
 PRODUCT_COPY_FILES += \

hdmi/cec/Android.bp

@@ -6,8 +6,6 @@
 cc_binary {
     name: "android.hardware.tv.hdmi.cec-service.rpi",
     relative_install_path: "hw",
-    init_rc: ["android.hardware.tv.hdmi.cec-service.rpi.rc"],
-    vintf_fragments: ["android.hardware.tv.hdmi.cec-service.rpi.xml"],
     vendor: true,
     srcs: [
         "HdmiCec.cpp",
@@ -22,4 +20,34 @@ cc_binary {
         "libhardware",
         "liblog",
     ],
+    installable: false,
+}
+
+prebuilt_etc {
+    name: "android.hardware.tv.hdmi.cec-service.rpi.rc",
+    src: "android.hardware.tv.hdmi.cec-service.rpi.rc",
+    installable: false,
+}
+
+prebuilt_etc {
+    name: "android.hardware.tv.hdmi.cec-service.rpi.xml",
+    src: "android.hardware.tv.hdmi.cec-service.rpi.xml",
+    sub_dir: "vintf",
+    installable: false,
+}
+
+apex {
+    name: "com.android.hardware.tv.hdmi.cec.rpi4",
+    manifest: "apex_manifest.json",
+    file_contexts: "apex_file_contexts",
+    key: "com.android.hardware.key",
+    certificate: ":com.android.hardware.certificate",
+    updatable: false,
+    vendor: true,
+
+    binaries: ["android.hardware.tv.hdmi.cec-service.rpi"],
+    prebuilts: [
+        "android.hardware.tv.hdmi.cec-service.rpi.rc",
+        "android.hardware.tv.hdmi.cec-service.rpi.xml",
+    ],
 }

hdmi/cec/android.hardware.tv.hdmi.cec-service.rpi.rc

@@ -1,4 +1,4 @@
-service vendor.cec-default /vendor/bin/hw/android.hardware.tv.hdmi.cec-service.rpi
+service vendor.cec-rpi /apex/com.android.hardware.tv.hdmi.cec.rpi4/bin/hw/android.hardware.tv.hdmi.cec-service.rpi
     interface aidl android.hardware.tv.hdmi.cec.IHdmiCec/default
     class hal
     user system

hdmi/cec/apex_file_contexts

@@ -0,0 +1,3 @@
+(/.*)?                                                 u:object_r:vendor_file:s0
+/etc(/.*)?                                             u:object_r:vendor_configs_file:s0
+/bin/hw/android\.hardware\.tv\.hdmi\.cec-service\.rpi  u:object_r:hal_tv_hdmi_cec_default_exec:s0

hdmi/cec/apex_manifest.json

@@ -0,0 +1,4 @@
+{
+    "name": "com.android.hardware.tv.hdmi.cec.rpi4",
+    "version": 1
+}

sepolicy/file_contexts

@@ -6,7 +6,6 @@
 /dev/cec1                                                                    u:object_r:cec_device:s0
 /sys/devices/platform/gpu/drm/card0/card0-HDMI-A-1/status                    u:object_r:sysfs_hdmi:s0
 /sys/devices/platform/gpu/drm/card0/card0-HDMI-A-2/status                    u:object_r:sysfs_hdmi:s0
-/vendor/bin/hw/android\.hardware\.tv\.hdmi\.cec-service\.rpi                 u:object_r:hal_tv_hdmi_cec_default_exec:s0
 /vendor/bin/hw/android\.hardware\.tv\.hdmi\.connection-service\.rpi          u:object_r:hal_tv_hdmi_connection_default_exec:s0
 
 # DRM