Revert^2 "Disable armnn nnapi backend"

Discontinue maintenance and active support of ArmNN on Pixel phones.

This reverts commit 4564ee58a4.
Reason for revert: resubmitting again together with a fix for the broken test

Bug: 294459623
Change-Id: I4635c49836dd0e5716308ed0184b14954ccdbd6b
Test: Local nnapi_info
Test: Presubmit
This commit is contained in:
Renato Grottesi 2023-08-07 10:07:22 +00:00 committed by Android (Google) Code Review
parent 4564ee58a4
commit 90d658bb11
6 changed files with 0 additions and 28 deletions

View file

@ -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

View file

@ -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

View file

@ -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)

View file

@ -1,2 +0,0 @@
allow priv_app armnn_app_service:service_manager find;
allow priv_app armnn_nnapi_service:service_manager find;

View file

@ -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;

View file

@ -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