From e8712e4c93a5d291a47943ec77fe9abe9e1e5dff Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Tue, 8 Nov 2022 13:31:14 +0800 Subject: [PATCH] remove edgetpu folder Bug: 258114806 Test: build pass with the setting still active Change-Id: I9cdf2bbe318647e1f02f152661e57f8430a9a1cb --- edgetpu/debug_camera_app.te | 5 ----- edgetpu/file_contexts | 2 -- edgetpu/genfs_contexts | 2 -- edgetpu/google_camera_app.te | 3 --- whitechapel_pro/debug_camera_app.te | 5 +++++ whitechapel_pro/file_contexts | 1 + whitechapel_pro/genfs_contexts | 3 +++ whitechapel_pro/google_camera_app.te | 4 ++++ 8 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 edgetpu/debug_camera_app.te delete mode 100644 edgetpu/file_contexts delete mode 100644 edgetpu/genfs_contexts delete mode 100644 edgetpu/google_camera_app.te diff --git a/edgetpu/debug_camera_app.te b/edgetpu/debug_camera_app.te deleted file mode 100644 index 44382239..00000000 --- a/edgetpu/debug_camera_app.te +++ /dev/null @@ -1,5 +0,0 @@ -userdebug_or_eng(` - # Allows GCA-Eng to find and access the EdgeTPU. - allow debug_camera_app edgetpu_app_service:service_manager find; - allow debug_camera_app edgetpu_device:chr_file { getattr read write ioctl map }; -') \ No newline at end of file diff --git a/edgetpu/file_contexts b/edgetpu/file_contexts deleted file mode 100644 index 7b5d25ab..00000000 --- a/edgetpu/file_contexts +++ /dev/null @@ -1,2 +0,0 @@ -# EdgeTPU device (DarwiNN) -/dev/janeiro u:object_r:edgetpu_device:s0 diff --git a/edgetpu/genfs_contexts b/edgetpu/genfs_contexts deleted file mode 100644 index 78e7e959..00000000 --- a/edgetpu/genfs_contexts +++ /dev/null @@ -1,2 +0,0 @@ -# EdgeTPU -genfscon sysfs /devices/platform/1ce00000.janeiro u:object_r:sysfs_edgetpu:s0 diff --git a/edgetpu/google_camera_app.te b/edgetpu/google_camera_app.te deleted file mode 100644 index a0ad7316..00000000 --- a/edgetpu/google_camera_app.te +++ /dev/null @@ -1,3 +0,0 @@ -# Allows GCA to find and access the EdgeTPU. -allow google_camera_app edgetpu_app_service:service_manager find; -allow google_camera_app edgetpu_device:chr_file { getattr read write ioctl map }; diff --git a/whitechapel_pro/debug_camera_app.te b/whitechapel_pro/debug_camera_app.te index 7ef8ab46..5342fb74 100644 --- a/whitechapel_pro/debug_camera_app.te +++ b/whitechapel_pro/debug_camera_app.te @@ -20,3 +20,8 @@ userdebug_or_eng(` # Allows camera app to access the PowerHAL. hal_client_domain(debug_camera_app, hal_power) ') +userdebug_or_eng(` + # Allows GCA-Eng to find and access the EdgeTPU. + allow debug_camera_app edgetpu_app_service:service_manager find; + allow debug_camera_app edgetpu_device:chr_file { getattr read write ioctl map }; +') \ No newline at end of file diff --git a/whitechapel_pro/file_contexts b/whitechapel_pro/file_contexts index 19bc8442..4aea8c79 100644 --- a/whitechapel_pro/file_contexts +++ b/whitechapel_pro/file_contexts @@ -80,6 +80,7 @@ /dev/dma_heap/vframe-secure u:object_r:dmabuf_system_secure_heap_device:s0 /dev/dma_heap/vscaler-secure u:object_r:vscaler_heap_device:s0 /dev/dma_heap/vstream-secure u:object_r:dmabuf_system_secure_heap_device:s0 +/dev/janeiro u:object_r:edgetpu_device:s0 /dev/bigocean u:object_r:video_device:s0 /dev/goodix_fp u:object_r:fingerprint_device:s0 /dev/stmvl53l1_ranging u:object_r:rls_device:s0 diff --git a/whitechapel_pro/genfs_contexts b/whitechapel_pro/genfs_contexts index 12ab5b97..54d97fb6 100644 --- a/whitechapel_pro/genfs_contexts +++ b/whitechapel_pro/genfs_contexts @@ -4,6 +4,9 @@ genfscon sysfs /devices/platform/exynos-bts/bts_stats u genfscon sysfs /firmware/devicetree/base/chosen u:object_r:sysfs_chosen:s0 +# EdgeTPU +genfscon sysfs /devices/platform/1ce00000.janeiro u:object_r:sysfs_edgetpu:s0 + # CPU genfscon sysfs /devices/platform/17000010.devfreq_mif/devfreq/17000010.devfreq_mif/time_in_state u:object_r:sysfs_cpu:s0 genfscon sysfs /devices/platform/cpupm/cpupm/time_in_state u:object_r:sysfs_cpu:s0 diff --git a/whitechapel_pro/google_camera_app.te b/whitechapel_pro/google_camera_app.te index 54f2d664..43e3c16e 100644 --- a/whitechapel_pro/google_camera_app.te +++ b/whitechapel_pro/google_camera_app.te @@ -17,3 +17,7 @@ allow google_camera_app vendor_fw_file:dir search; # Allows camera app to access the PowerHAL. hal_client_domain(google_camera_app, hal_power) + +# Allows GCA to find and access the EdgeTPU. +allow google_camera_app edgetpu_app_service:service_manager find; +allow google_camera_app edgetpu_device:chr_file { getattr read write ioctl map };