From 3d232dc7ceeeb8862a05e7055aedebe7d4226bdb Mon Sep 17 00:00:00 2001 From: Arian Date: Sat, 24 Aug 2024 15:44:29 +0200 Subject: [PATCH] sm8450-common: Add hals.conf to load sensors.xiaomi to odm and move notifier to subdir Change-Id: I9e16531e60fa6a0122330ee352cddd0840feb39c --- common.mk | 3 +++ sensors/hals.conf | 1 + sensors/{ => sensor-notifier}/Android.bp | 0 sensors/{ => sensor-notifier}/SensorNotifier.cpp | 0 sensors/{ => sensor-notifier}/SensorNotifierExt.cpp | 0 sensors/{ => sensor-notifier}/include/SensorNotifier.h | 0 sensors/{ => sensor-notifier}/include/SensorNotifierExt.h | 0 sensors/{ => sensor-notifier}/include/SensorNotifierUtils.h | 0 sensors/{ => sensor-notifier}/include/SscCalApi.h | 0 sensors/{ => sensor-notifier}/main.cpp | 0 sensors/{ => sensor-notifier}/notifiers/AodNotifier.cpp | 0 sensors/{ => sensor-notifier}/notifiers/AodNotifier.h | 0 sensors/{ => sensor-notifier}/notifiers/LightNotifier.cpp | 0 sensors/{ => sensor-notifier}/notifiers/LightNotifier.h | 0 sensors/{ => sensor-notifier}/notifiers/NonUiNotifier.cpp | 0 sensors/{ => sensor-notifier}/notifiers/NonUiNotifier.h | 0 sensors/{ => sensor-notifier}/sensor-notifier.rc | 0 sensors/{ => sensor-notifier}/utils/SensorNotifierUtils.cpp | 0 sensors/{ => sensor-notifier}/utils/SscCalApiWrapper.cpp | 0 19 files changed, 4 insertions(+) create mode 100644 sensors/hals.conf rename sensors/{ => sensor-notifier}/Android.bp (100%) rename sensors/{ => sensor-notifier}/SensorNotifier.cpp (100%) rename sensors/{ => sensor-notifier}/SensorNotifierExt.cpp (100%) rename sensors/{ => sensor-notifier}/include/SensorNotifier.h (100%) rename sensors/{ => sensor-notifier}/include/SensorNotifierExt.h (100%) rename sensors/{ => sensor-notifier}/include/SensorNotifierUtils.h (100%) rename sensors/{ => sensor-notifier}/include/SscCalApi.h (100%) rename sensors/{ => sensor-notifier}/main.cpp (100%) rename sensors/{ => sensor-notifier}/notifiers/AodNotifier.cpp (100%) rename sensors/{ => sensor-notifier}/notifiers/AodNotifier.h (100%) rename sensors/{ => sensor-notifier}/notifiers/LightNotifier.cpp (100%) rename sensors/{ => sensor-notifier}/notifiers/LightNotifier.h (100%) rename sensors/{ => sensor-notifier}/notifiers/NonUiNotifier.cpp (100%) rename sensors/{ => sensor-notifier}/notifiers/NonUiNotifier.h (100%) rename sensors/{ => sensor-notifier}/sensor-notifier.rc (100%) rename sensors/{ => sensor-notifier}/utils/SensorNotifierUtils.cpp (100%) rename sensors/{ => sensor-notifier}/utils/SscCalApiWrapper.cpp (100%) diff --git a/common.mk b/common.mk index 65207f4..eb28f17 100644 --- a/common.mk +++ b/common.mk @@ -441,6 +441,9 @@ PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \ sensor-notifier +PRODUCT_COPY_FILES += \ + $(LOCAL_PATH)/sensors/hals.conf:$(TARGET_COPY_OUT_ODM)/etc/sensors/hals.conf + $(foreach sku, taro diwali cape ukee, \ $(eval PRODUCT_COPY_FILES += \ frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/sku_$(sku)/android.hardware.sensor.accelerometer.xml \ diff --git a/sensors/hals.conf b/sensors/hals.conf new file mode 100644 index 0000000..f7b9cd7 --- /dev/null +++ b/sensors/hals.conf @@ -0,0 +1 @@ +sensors.xiaomi.so diff --git a/sensors/Android.bp b/sensors/sensor-notifier/Android.bp similarity index 100% rename from sensors/Android.bp rename to sensors/sensor-notifier/Android.bp diff --git a/sensors/SensorNotifier.cpp b/sensors/sensor-notifier/SensorNotifier.cpp similarity index 100% rename from sensors/SensorNotifier.cpp rename to sensors/sensor-notifier/SensorNotifier.cpp diff --git a/sensors/SensorNotifierExt.cpp b/sensors/sensor-notifier/SensorNotifierExt.cpp similarity index 100% rename from sensors/SensorNotifierExt.cpp rename to sensors/sensor-notifier/SensorNotifierExt.cpp diff --git a/sensors/include/SensorNotifier.h b/sensors/sensor-notifier/include/SensorNotifier.h similarity index 100% rename from sensors/include/SensorNotifier.h rename to sensors/sensor-notifier/include/SensorNotifier.h diff --git a/sensors/include/SensorNotifierExt.h b/sensors/sensor-notifier/include/SensorNotifierExt.h similarity index 100% rename from sensors/include/SensorNotifierExt.h rename to sensors/sensor-notifier/include/SensorNotifierExt.h diff --git a/sensors/include/SensorNotifierUtils.h b/sensors/sensor-notifier/include/SensorNotifierUtils.h similarity index 100% rename from sensors/include/SensorNotifierUtils.h rename to sensors/sensor-notifier/include/SensorNotifierUtils.h diff --git a/sensors/include/SscCalApi.h b/sensors/sensor-notifier/include/SscCalApi.h similarity index 100% rename from sensors/include/SscCalApi.h rename to sensors/sensor-notifier/include/SscCalApi.h diff --git a/sensors/main.cpp b/sensors/sensor-notifier/main.cpp similarity index 100% rename from sensors/main.cpp rename to sensors/sensor-notifier/main.cpp diff --git a/sensors/notifiers/AodNotifier.cpp b/sensors/sensor-notifier/notifiers/AodNotifier.cpp similarity index 100% rename from sensors/notifiers/AodNotifier.cpp rename to sensors/sensor-notifier/notifiers/AodNotifier.cpp diff --git a/sensors/notifiers/AodNotifier.h b/sensors/sensor-notifier/notifiers/AodNotifier.h similarity index 100% rename from sensors/notifiers/AodNotifier.h rename to sensors/sensor-notifier/notifiers/AodNotifier.h diff --git a/sensors/notifiers/LightNotifier.cpp b/sensors/sensor-notifier/notifiers/LightNotifier.cpp similarity index 100% rename from sensors/notifiers/LightNotifier.cpp rename to sensors/sensor-notifier/notifiers/LightNotifier.cpp diff --git a/sensors/notifiers/LightNotifier.h b/sensors/sensor-notifier/notifiers/LightNotifier.h similarity index 100% rename from sensors/notifiers/LightNotifier.h rename to sensors/sensor-notifier/notifiers/LightNotifier.h diff --git a/sensors/notifiers/NonUiNotifier.cpp b/sensors/sensor-notifier/notifiers/NonUiNotifier.cpp similarity index 100% rename from sensors/notifiers/NonUiNotifier.cpp rename to sensors/sensor-notifier/notifiers/NonUiNotifier.cpp diff --git a/sensors/notifiers/NonUiNotifier.h b/sensors/sensor-notifier/notifiers/NonUiNotifier.h similarity index 100% rename from sensors/notifiers/NonUiNotifier.h rename to sensors/sensor-notifier/notifiers/NonUiNotifier.h diff --git a/sensors/sensor-notifier.rc b/sensors/sensor-notifier/sensor-notifier.rc similarity index 100% rename from sensors/sensor-notifier.rc rename to sensors/sensor-notifier/sensor-notifier.rc diff --git a/sensors/utils/SensorNotifierUtils.cpp b/sensors/sensor-notifier/utils/SensorNotifierUtils.cpp similarity index 100% rename from sensors/utils/SensorNotifierUtils.cpp rename to sensors/sensor-notifier/utils/SensorNotifierUtils.cpp diff --git a/sensors/utils/SscCalApiWrapper.cpp b/sensors/sensor-notifier/utils/SscCalApiWrapper.cpp similarity index 100% rename from sensors/utils/SscCalApiWrapper.cpp rename to sensors/sensor-notifier/utils/SscCalApiWrapper.cpp