commit 25bb7e269d5382496a28c51f042d012fa943b535
author Jyoti Bhayana <jbhayana@google.com> Mon Aug 17 16:37:58 2020 -0700
committer Jyoti Bhayana <jbhayana@google.com> Thu Aug 20 10:49:35 2020 -0700
tree 5e929e5cf1bbadb19c53ae2df5dd5a37c28003d5
parent c9fe043bfeb28ecb6fa909d4a01c25b334594037

Copy only accel and gyro sensor permission files to target for trout

Bug: 163158061
Test: Build and test that only accel and gyro sensor permission files
are copied for trout

Change-Id: I578885d6fa7df61159f00016af7fb68d71f6a22e

aosp_trout_arm64.mk

diff --git a/aosp_trout_arm64.mk b/aosp_trout_arm64.mk
index 65688d9..78db5cc 100644
--- a/aosp_trout_arm64.mk
+++ b/aosp_trout_arm64.mk
@@ -33,11 +33,14 @@
     android.hardware.sensors@2.0-service.multihal.rc \
     android.hardware.sensors@2.0-Google-IIO-Subhal \
 
+LOCAL_SENSOR_FILE_OVERRIDES := true
+
 PRODUCT_COPY_FILES += \
     device/google/trout/product_files/odm/ueventd.rc:$(TARGET_COPY_OUT_ODM)/ueventd.rc \
     device/google/trout/product_files/odm/usr/idc/Vendor_0fff_Product_0fff.idc:$(TARGET_COPY_OUT_ODM)/usr/idc/Vendor_0fff_Product_0fff.idc \
-
-PRODUCT_COPY_FILES += device/google/trout/product_files/vendor/etc/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf
+    device/google/trout/product_files/vendor/etc/sensors/hals.conf:$(TARGET_COPY_OUT_VENDOR)/etc/sensors/hals.conf \
+    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.accelerometer.xml:$(TARGET_COPY_OUT_VENDOR)/etc/permissions/android.hardware.sensor.accelerometer.xml \
 
 PRODUCT_NAME := aosp_trout_arm64
 PRODUCT_DEVICE := vsoc_arm64