From 9339bc54f2ab1a9c9e3f7c21b1f343f79950179b Mon Sep 17 00:00:00 2001
From: Nolen Johnson <johnsonnolen@gmail.com>
Date: Sat, 20 Sep 2025 22:15:31 -0400
Subject: [PATCH] nx: Use TARGET_TEGRA_SENSORS

* iio is now supported in tegra-common.

Change-Id: Ib3fa9d7e01fd0fc5816c97289a4977b42bfb4008
---
 BoardConfig.mk               |  1 -
 device.mk                    | 13 ++-----------
 initfiles/init.sensors.nx.rc |  2 --
 manifests/manifest.xml       | 11 -----------
 4 files changed, 2 insertions(+), 25 deletions(-)
 delete mode 100644 manifests/manifest.xml

diff --git a/BoardConfig.mk b/BoardConfig.mk
index 33961ed..fbfef94 100644
--- a/BoardConfig.mk
+++ b/BoardConfig.mk
@@ -44,7 +44,6 @@ TARGET_BOARD_INFO_FILE := device/nintendo/nx/board-info.txt
 
 # Manifest
 DEVICE_FRAMEWORK_COMPATIBILITY_MATRIX_FILE += device/nintendo/nx/manifests/device_framework_matrix.xml
-DEVICE_MANIFEST_FILE := device/nintendo/nx/manifests/manifest.xml
 
 # Bluetooth
 TARGET_VENDOR_PROP += device/nintendo/nx/bluetooth.prop
diff --git a/device.mk b/device.mk
index 34cda9c..5e02c1b 100644
--- a/device.mk
+++ b/device.mk
@@ -25,6 +25,8 @@ TARGET_TEGRA_LIGHT    ?= lineage
 TARGET_TEGRA_MAN_LVL  := 5
 TARGET_TEGRA_MEMTRACK ?= rel-shield-r
 TARGET_TEGRA_POWER    := perfmgr
+TARGET_TEGRA_SENSORS  := iio
+TARGET_TEGRA_SENSOR_FEATURES := accelerometer gyroscope light
 TARGET_TEGRA_THERMAL  ?= lineage
 TARGET_TEGRA_UBOOT    := prebuilt
 TARGET_TEGRA_WIDEVINE ?= rel-shield-r
@@ -185,17 +187,6 @@ endif
 # Recovery
 PRODUCT_SYSTEM_DEFAULT_PROPERTIES += persist.vendor.recovery_update=true
 
-# Sensors
-PRODUCT_PACKAGES += \
-    android.hardware.sensors@1.0-service \
-    android.hardware.sensors@1.0-impl \
-    sensors.iio
-
-PRODUCT_COPY_FILES += \
-    frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \
-    frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.gyroscope.xml \
-    frameworks/native/data/etc/android.hardware.sensor.light.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.light.xml
-
 # Shipping API
 $(call inherit-product, $(SRC_TARGET_DIR)/product/product_launched_with_l.mk)
 
diff --git a/initfiles/init.sensors.nx.rc b/initfiles/init.sensors.nx.rc
index 925ac11..ad74a7f 100644
--- a/initfiles/init.sensors.nx.rc
+++ b/initfiles/init.sensors.nx.rc
@@ -17,8 +17,6 @@
 #       props are cut to 31.
 
 on init
-    setprop ro.hardware.sensors iio
-
     # Force polling mode for accel and gyro
     setprop ro.iio.accel.quirks no-trig,no-event
     setprop ro.iio.anglvel.quirks no-trig,no-event
diff --git a/manifests/manifest.xml b/manifests/manifest.xml
deleted file mode 100644
index 94fcfa1..0000000
--- a/manifests/manifest.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<manifest version="1.0" type="device" target-level="5">
-    <hal format="hidl">
-        <name>android.hardware.sensors</name>
-        <transport>hwbinder</transport>
-        <version>1.0</version>
-        <interface>
-            <name>ISensors</name>
-            <instance>default</instance>
-        </interface>
-    </hal>
-</manifest>