From 048849fcdf345e50cd1086c1908c791e2a7b081c Mon Sep 17 00:00:00 2001 From: Willi Ye Date: Sun, 10 May 2020 00:15:07 +0800 Subject: [PATCH] universal7885: Use custom Samsung sensors implementation * Get rid of com.samsung.permission.SSENSOR * Map vendor proximity sensor type to generic Signed-off-by: Jesse Chan Signed-off-by: SamarV-121 Change-Id: I022d9061b144925b1291ba6294fe018faba07fed --- sensors/Android.mk | 37 ++++++++++++++++++++++++++++++++++ sepolicy/private/file_contexts | 2 ++ universal7904-common.mk | 4 ++++ 3 files changed, 43 insertions(+) create mode 100644 sensors/Android.mk diff --git a/sensors/Android.mk b/sensors/Android.mk new file mode 100644 index 0000000..5f55072 --- /dev/null +++ b/sensors/Android.mk @@ -0,0 +1,37 @@ +# SPDX-License-Identifier: Apache-2.0 +# Copyright (C) 2020 The LineageOS Project + +LOCAL_PATH := hardware/samsung/hidl/sensors/1.0 + +include $(CLEAR_VARS) + +LOCAL_MODULE := android.hardware.sensors@1.0-impl.samsung-universal7904 +LOCAL_MODULE_TAGS := optional +LOCAL_VENDOR_MODULE := true + +LOCAL_MODULE_PATH_32 := $(TARGET_OUT_PRODUCT)/vendor_overlay/29/lib +LOCAL_MODULE_PATH_64 := $(TARGET_OUT_PRODUCT)/vendor_overlay/29/lib64 +LOCAL_MODULE_RELATIVE_PATH := hw + +LOCAL_SRC_FILES := \ + Sensors.cpp + +LOCAL_SHARED_LIBRARIES := \ + liblog \ + libcutils \ + libhardware \ + libbase \ + libutils \ + libhidlbase \ + android.hardware.sensors@1.0 + +LOCAL_STATIC_LIBRARIES := \ + android.hardware.sensors@1.0-convert \ + multihal + +LOCAL_POST_INSTALL_CMD := mkdir -p $(LOCAL_MODULE_PATH_32)/hw +LOCAL_POST_INSTALL_CMD += ; mkdir -p $(LOCAL_MODULE_PATH_64)/hw +LOCAL_POST_INSTALL_CMD += ; ln -sf $(LOCAL_MODULE).so $(LOCAL_MODULE_PATH_32)/hw/android.hardware.sensors@1.0-impl.so +LOCAL_POST_INSTALL_CMD += ; ln -sf $(LOCAL_MODULE).so $(LOCAL_MODULE_PATH_64)/hw/android.hardware.sensors@1.0-impl.so + +include $(BUILD_SHARED_LIBRARY) diff --git a/sepolicy/private/file_contexts b/sepolicy/private/file_contexts index 2a084aa..42ed6e1 100644 --- a/sepolicy/private/file_contexts +++ b/sepolicy/private/file_contexts @@ -8,3 +8,5 @@ # Vendor overlay /(product|system/product)/vendor_overlay/[0-9]+/etc(/.*)? u:object_r:vendor_configs_file:s0 +/(product|system/product)/vendor_overlay/[0-9]+/lib(64)?/hw u:object_r:vendor_hal_file:s0 + diff --git a/universal7904-common.mk b/universal7904-common.mk index ded8099..e781154 100644 --- a/universal7904-common.mk +++ b/universal7904-common.mk @@ -67,6 +67,10 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ SamsungDoze +# Sensors +PRODUCT_PACKAGES += \ + android.hardware.sensors@1.0-impl.samsung-universal7904 + # Skip Mount PRODUCT_COPY_FILES += \ build/target/product/gsi/gsi_skip_mount.cfg:system/system_ext/etc/init/config/skip_mount.cfg