diff options
| author | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-09 03:05:36 +0000 |
|---|---|---|
| committer | Android Build Coastguard Worker <android-build-coastguard-worker@google.com> | 2023-08-09 03:05:36 +0000 |
| commit | 6ae22a5b945c9609deae652c7842a9f5257c76fb (patch) | |
| tree | 4b38bdc55420ec2a92fa55f6df76d871848e9aed | |
| parent | 88b4585fe70bff96964a3ac3b3bed7be2f53369d (diff) | |
| parent | 516b1b940b90391dc47d69e00cc90fcc9ab91f20 (diff) | |
| download | gs-common-android14-d1-s2-release.tar.gz | |
Merge cherrypicks of ['googleplex-android-review.googlesource.com/24321293'] into udc-d1-release.android-14.0.0_r9android-14.0.0_r8android-14.0.0_r7android-14.0.0_r6android-14.0.0_r5android-14.0.0_r4android-14.0.0_r3android-14.0.0_r12android-14.0.0_r11android-14.0.0_r10android14-d1-s7-releaseandroid14-d1-s6-releaseandroid14-d1-s5-releaseandroid14-d1-s4-releaseandroid14-d1-s3-releaseandroid14-d1-s2-releaseandroid14-d1-s1-releaseandroid14-d1-release
Change-Id: I60b472df806265b4fd710bada83a921212f953bf
| -rw-r--r-- | gpu/gpu.mk | 3 | ||||
| -rw-r--r-- | gpu/sepolicy/file_contexts | 1 | ||||
| -rw-r--r-- | gpu/sepolicy/hal_neuralnetworks_armnn.te | 18 | ||||
| -rw-r--r-- | gpu/sepolicy/priv_app.te | 3 | ||||
| -rw-r--r-- | gpu/sepolicy/service.te | 5 | ||||
| -rw-r--r-- | gpu/sepolicy/service_contexts | 4 |
6 files changed, 0 insertions, 34 deletions
diff --git a/gpu/gpu.mk b/gpu/gpu.mk deleted file mode 100644 index f7a3542..0000000 --- a/gpu/gpu.mk +++ /dev/null @@ -1,3 +0,0 @@ -BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gpu/sepolicy - -PRODUCT_PACKAGES += android.hardware.neuralnetworks-shim-service-armnn diff --git a/gpu/sepolicy/file_contexts b/gpu/sepolicy/file_contexts deleted file mode 100644 index 571c211..0000000 --- a/gpu/sepolicy/file_contexts +++ /dev/null @@ -1 +0,0 @@ -/vendor/bin/hw/android\.hardware\.neuralnetworks-shim-service-armnn u:object_r:hal_neuralnetworks_armnn_exec:s0 diff --git a/gpu/sepolicy/hal_neuralnetworks_armnn.te b/gpu/sepolicy/hal_neuralnetworks_armnn.te deleted file mode 100644 index d08ec2c..0000000 --- a/gpu/sepolicy/hal_neuralnetworks_armnn.te +++ /dev/null @@ -1,18 +0,0 @@ -type hal_neuralnetworks_armnn, domain; -hal_server_domain(hal_neuralnetworks_armnn, hal_neuralnetworks) - -type hal_neuralnetworks_armnn_exec, exec_type, vendor_file_type, file_type; -init_daemon_domain(hal_neuralnetworks_armnn) - -add_service(hal_neuralnetworks_armnn, armnn_nnapi_service); - -allow hal_neuralnetworks_armnn armnn_app_service:service_manager find; - -get_prop(hal_neuralnetworks_armnn, hwservicemanager_prop) - -allow isolated_app app_data_file:file setattr; - -allow hal_neuralnetworks_armnn fwk_stats_service:service_manager find; -binder_call(hal_neuralnetworks_armnn, system_server); -binder_use(hal_neuralnetworks_armnn) - diff --git a/gpu/sepolicy/priv_app.te b/gpu/sepolicy/priv_app.te deleted file mode 100644 index c2452f1..0000000 --- a/gpu/sepolicy/priv_app.te +++ /dev/null @@ -1,3 +0,0 @@ -allow priv_app armnn_app_service:service_manager find; -allow priv_app armnn_nnapi_service:service_manager find; - diff --git a/gpu/sepolicy/service.te b/gpu/sepolicy/service.te deleted file mode 100644 index cb788b6..0000000 --- a/gpu/sepolicy/service.te +++ /dev/null @@ -1,5 +0,0 @@ -type armnn_nnapi_service, app_api_service, service_manager_type, isolated_compute_allowed_service; -type armnn_vendor_service, service_manager_type, hal_service_type; -type armnn_dba_service, app_api_service, service_manager_type, isolated_compute_allowed_service; -type armnn_app_service, service_manager_type; - diff --git a/gpu/sepolicy/service_contexts b/gpu/sepolicy/service_contexts deleted file mode 100644 index d81ca78..0000000 --- a/gpu/sepolicy/service_contexts +++ /dev/null @@ -1,4 +0,0 @@ -com.google.armnn.IArmnnVendorService/default u:object_r:armnn_vendor_service:s0 -android.hardware.neuralnetworks.IDevice/google-armnn u:object_r:armnn_nnapi_service:s0 -com.google.armnn.IArmnnpAppService/default u:object_r:armnn_app_service:s0 - |