From e8c933f6260319a54931c0dab18f066f9e10347b Mon Sep 17 00:00:00 2001 From: Renato Grottesi Date: Fri, 4 Aug 2023 08:23:22 +0000 Subject: [PATCH] Disable armnn nnapi backend Discontinue maintenance and active support of ArmNN on Pixel phones. Bug: 294459623 Test: Local nnapi_info Change-Id: I142e27e4084e0f8bb82212c35512d327257953b3 --- gpu/gpu.mk | 1 - gpu/sepolicy/file_contexts | 1 - gpu/sepolicy/hal_neuralnetworks_armnn.te | 17 ----------------- gpu/sepolicy/priv_app.te | 2 -- gpu/sepolicy/service.te | 4 ---- gpu/sepolicy/service_contexts | 3 --- 6 files changed, 28 deletions(-) delete mode 100644 gpu/sepolicy/hal_neuralnetworks_armnn.te delete mode 100644 gpu/sepolicy/priv_app.te delete mode 100644 gpu/sepolicy/service.te delete mode 100644 gpu/sepolicy/service_contexts diff --git a/gpu/gpu.mk b/gpu/gpu.mk index 67d1263..d1c3a6d 100644 --- a/gpu/gpu.mk +++ b/gpu/gpu.mk @@ -1,4 +1,3 @@ BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gpu/sepolicy PRODUCT_PACKAGES += gpu_probe -PRODUCT_PACKAGES += android.hardware.neuralnetworks-shim-service-armnn diff --git a/gpu/sepolicy/file_contexts b/gpu/sepolicy/file_contexts index 7cadf04..764cb67 100644 --- a/gpu/sepolicy/file_contexts +++ b/gpu/sepolicy/file_contexts @@ -1,3 +1,2 @@ /vendor/bin/gpu_probe u:object_r:gpu_probe_exec:s0 -/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 62c3257..0000000 --- a/gpu/sepolicy/hal_neuralnetworks_armnn.te +++ /dev/null @@ -1,17 +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 97eec7c..0000000 --- a/gpu/sepolicy/priv_app.te +++ /dev/null @@ -1,2 +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 bf5f3ce..0000000 --- a/gpu/sepolicy/service.te +++ /dev/null @@ -1,4 +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 a881130..0000000 --- a/gpu/sepolicy/service_contexts +++ /dev/null @@ -1,3 +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