commit d1664b8c32a6f8fbb519e8ef63a8b57f25511157
author Denis Ciocca <denis.ciocca@st.com> Wed Nov 01 17:09:59 2017 +0000
committer android-build-merger <android-build-merger@google.com> Wed Nov 01 17:09:59 2017 +0000
tree 6f5597d1153f08b97534011e50015dc54fcc7b37
parent 7c771fdfbd78cd9eec6dd0f4bd4f03b995bee710
parent b92f2ef088486ec5f51712ab00bca52601cb607a

hikey: Add sensors config files with neonkey / argonkey
am: b92f2ef088

Change-Id: Ibb65c3029f79ac99aa5aeafe0a1dd86c5d68c424

device-common.mk

diff --git a/device-common.mk b/device-common.mk
index 7c35fa7..d3476b5 100644
--- a/device-common.mk
+++ b/device-common.mk
@@ -108,6 +108,25 @@
 
 PRODUCT_COPY_FILES += \
     device/linaro/hikey/init.common.nanohub.rc:$(TARGET_COPY_OUT_VENDOR)/etc/init/init.nanohub.rc
+
+# Copy sensors config file(s)
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.sensor.accelerometer.xml:system/etc/permissions/android.hardware.sensor.accelerometer.xml \
+    frameworks/native/data/etc/android.hardware.sensor.ambient_temperature.xml:system/etc/permissions/android.hardware.sensor.ambient_temperature.xml \
+    frameworks/native/data/etc/android.hardware.sensor.barometer.xml:system/etc/permissions/android.hardware.sensor.barometer.xml \
+    frameworks/native/data/etc/android.hardware.sensor.compass.xml:system/etc/permissions/android.hardware.sensor.compass.xml \
+    frameworks/native/data/etc/android.hardware.sensor.gyroscope.xml:system/etc/permissions/android.hardware.sensor.gyroscope.xml \
+    frameworks/native/data/etc/android.hardware.sensor.hifi_sensors.xml:system/etc/permissions/android.hardware.sensor.hifi_sensors.xml \
+    frameworks/native/data/etc/android.hardware.sensor.light.xml:system/etc/permissions/android.hardware.sensor.light.xml \
+    frameworks/native/data/etc/android.hardware.sensor.relative_humidity.xml:system/etc/permissions/android.hardware.sensor.relative_humidity.xml \
+    frameworks/native/data/etc/android.hardware.sensor.stepcounter.xml:system/etc/permissions/android.hardware.sensor.stepcounter.xml \
+    frameworks/native/data/etc/android.hardware.sensor.stepdetector.xml:system/etc/permissions/android.hardware.sensor.stepdetector.xml
+
+# Argonkey VL53L0X proximity driver is not available yet. So we are going to copy conf file for neonkey only
+ifeq ($(TARGET_SENSOR_MEZZANINE),neonkey)
+PRODUCT_COPY_FILES += \
+    frameworks/native/data/etc/android.hardware.sensor.proximity.xml:system/etc/permissions/android.hardware.sensor.proximity.xml
+endif
 endif
 
 # Use Launcher3