Fix the permission and property issues in EVS
Bug: 200726696
Test: tested with
https://googleplex-android-review.git.corp.google.com/c/platform/packages/services/Car/+/16042908 ; launch evs app on Trout
Change-Id: I97c6649f763f4b4be380a4c1ae1edab4d05868f5
diff --git a/aosp_trout_common.mk b/aosp_trout_common.mk
index b2fcbd0..31bad4b 100644
--- a/aosp_trout_common.mk
+++ b/aosp_trout_common.mk
@@ -65,9 +65,11 @@
device/google/trout/product_files/etc/automotive/evs/config_override.json:${TARGET_COPY_OUT_SYSTEM}/etc/automotive/evs/config_override.json \
device/google/trout/product_files/vendor/etc/automotive/evs/evs_configuration_override.xml:$(TARGET_COPY_OUT_VENDOR)/etc/automotive/evs/evs_configuration_override.xml \
+LOCAL_EVS_PROPERTIES ?= persist.automotive.evs.mode=1
ENABLE_EVS_SAMPLE := true
-BOARD_SEPOLICY_DIRS += device/google/trout/sepolicy/vendor/google
+PRODUCT_COPY_FILES += \
+ ${LOCAL_EVS_PRODUCT_COPY_FILES} \
# Disable Vulkan feature flag as it is not supported on trout
TARGET_VULKAN_SUPPORT := false
@@ -90,12 +92,6 @@
PRODUCT_PACKAGES += tinyplay
-PRODUCT_COPY_FILES += \
- ${LOCAL_EVS_PRODUCT_COPY_FILES} \
-
-PRODUCT_COPY_FILES += \
- ${LOCAL_EVS_PRODUCT_COPY_FILES} \
-
include packages/services/Car/cpp/computepipe/products/computepipe.mk
# Trout fstab (workaround b/182190949)
@@ -113,3 +109,5 @@
# Android Bluetooth stack configuration
BOARD_BLUETOOTH_BDROID_BUILDCFG_INCLUDE_DIR ?= device/google/trout/product_files/bluetooth
+
+BOARD_SEPOLICY_DIRS += device/google/trout/sepolicy/vendor/google
diff --git a/product_files/odm/ueventd.rc b/product_files/odm/ueventd.rc
index 2eeb104..8a5e753 100644
--- a/product_files/odm/ueventd.rc
+++ b/product_files/odm/ueventd.rc
@@ -16,4 +16,5 @@
/sys/bus/iio/devices/iio:device* scan_elements/in_anglvel_y_en 0660 system system
/sys/bus/iio/devices/iio:device* scan_elements/in_anglvel_z_en 0660 system system
+/dev/video* 0660 system camera
/dev/vport*p1 0660 bluetooth bluetooth