From 5a8e72b2ae917b64f7d01e980ff20b9d8b7156c7 Mon Sep 17 00:00:00 2001 From: Marc Bourgoin Date: Thu, 17 Dec 2020 11:56:16 -0700 Subject: [PATCH] zippo: move FOD HAL to vendor Change-Id: Iae204f87d10935e1b86eab5cd682e149a867bc41 --- device.mk | 4 ++-- fod/Android.bp | 5 +++-- ...metrics.fingerprint.inscreen@1.0-service.lenovo_zippo.rc} | 2 +- sepolicy/vendor/file_contexts | 2 +- sepolicy/vendor/hal_fod_lenovo_zippo.te | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) rename fod/{lineage.biometrics.fingerprint.inscreen@1.0-service.lenovo_zippo.rc => vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.lenovo_zippo.rc} (71%) diff --git a/device.mk b/device.mk index 599c617..b036d4a 100644 --- a/device.mk +++ b/device.mk @@ -67,7 +67,7 @@ PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.wifi.rtt.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.wifi.rtt.xml \ frameworks/native/data/etc/android.software.ipsec_tunnels.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.software.ipsec_tunnels.xml \ frameworks/native/data/etc/handheld_core_hardware.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/handheld_core_hardware.xml \ - vendor/lineage/config/permissions/vendor.lineage.biometrics.fingerprint.inscreen.xml:$(TARGET_COPY_OUT_SYSTEM)/etc/permissions/vendor.lineage.biometrics.fingerprint.inscreen.xml + vendor/lineage/config/permissions/vendor.lineage.biometrics.fingerprint.inscreen.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/vendor.lineage.biometrics.fingerprint.inscreen.xml # AID/fs configs PRODUCT_PACKAGES += \ @@ -201,7 +201,7 @@ PRODUCT_PACKAGES += \ # Fingerprint PRODUCT_PACKAGES += \ - lineage.biometrics.fingerprint.inscreen@1.0-service.lenovo_zippo + vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.lenovo_zippo # FM PRODUCT_PACKAGES += \ diff --git a/fod/Android.bp b/fod/Android.bp index e009f8d..1984253 100644 --- a/fod/Android.bp +++ b/fod/Android.bp @@ -16,9 +16,10 @@ cc_binary { relative_install_path: "hw", defaults: ["hidl_defaults"], - name: "lineage.biometrics.fingerprint.inscreen@1.0-service.lenovo_zippo", - init_rc: ["lineage.biometrics.fingerprint.inscreen@1.0-service.lenovo_zippo.rc"], + name: "vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.lenovo_zippo", + init_rc: ["vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.lenovo_zippo.rc"], srcs: ["service.cpp", "FingerprintInscreen.cpp"], + vendor: true, shared_libs: [ "libbase", "libhardware", diff --git a/fod/lineage.biometrics.fingerprint.inscreen@1.0-service.lenovo_zippo.rc b/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.lenovo_zippo.rc similarity index 71% rename from fod/lineage.biometrics.fingerprint.inscreen@1.0-service.lenovo_zippo.rc rename to fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.lenovo_zippo.rc index 9838d14..911c4c5 100644 --- a/fod/lineage.biometrics.fingerprint.inscreen@1.0-service.lenovo_zippo.rc +++ b/fod/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.lenovo_zippo.rc @@ -2,7 +2,7 @@ on init chown system system /sys/class/backlight/panel0-hbm/brightness chmod 0660 /sys/class/backlight/panel0-hbm/brightness -service fingerprint-inscreen-1-0 /system/bin/hw/lineage.biometrics.fingerprint.inscreen@1.0-service.lenovo_zippo +service fingerprint-inscreen-1-0 /vendor/bin/hw/vendor.lineage.biometrics.fingerprint.inscreen@1.0-service.lenovo_zippo interface vendor.lineage.biometrics.fingerprint.inscreen@1.0::IFingerprintInscreen default class hal user system diff --git a/sepolicy/vendor/file_contexts b/sepolicy/vendor/file_contexts index 270cab8..2025365 100644 --- a/sepolicy/vendor/file_contexts +++ b/sepolicy/vendor/file_contexts @@ -5,8 +5,8 @@ /persist(/.*)? u:object_r:persist_file:s0 # HALs -/system/bin/hw/lineage\.biometrics\.fingerprint\.inscreen@1\.0-service\.lenovo_zippo u:object_r:hal_fod_lenovo_zippo_exec:s0 /(vendor|system/vendor)/bin/hw/android\.hardware\.light@2\.0-service\.lenovo_zippo u:object_r:hal_light_default_exec:s0 +/(vendor|system/vendor)/bin/hw/vendor\.lineage\.biometrics\.fingerprint\.inscreen@1\.0-service\.lenovo_zippo u:object_r:hal_fod_lenovo_zippo_exec:s0 # Touch /sys/devices/virtual/touch/tp_dev/gesture_on u:object_r:sysfs_tp:s0 diff --git a/sepolicy/vendor/hal_fod_lenovo_zippo.te b/sepolicy/vendor/hal_fod_lenovo_zippo.te index b215a03..790e169 100644 --- a/sepolicy/vendor/hal_fod_lenovo_zippo.te +++ b/sepolicy/vendor/hal_fod_lenovo_zippo.te @@ -1,5 +1,5 @@ -type hal_fod_lenovo_zippo, coredomain, domain; +type hal_fod_lenovo_zippo, domain; hal_server_domain(hal_fod_lenovo_zippo, hal_lineage_fod) -type hal_fod_lenovo_zippo_exec, system_file_type, exec_type, file_type; +type hal_fod_lenovo_zippo_exec, exec_type, vendor_file_type, file_type; init_daemon_domain(hal_fod_lenovo_zippo)