Evolution-X-Tensor/device_google_gs-common
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Revert "Disable armnn nnapi backend"

Browse source 
This reverts commit e8c933f626.

Reason for revert: Breaks tests 
Bug: 294459623
Fixes: 294795899

Change-Id: Ia795c9981a42d59a3fe4bd8ebdfb870d5ff87480
This commit is contained in:
Adrian Roos 2023-08-07 09:27:20 +00:00 • committed by Android (Google) Code Review
parent e8c933f626
commit 4564ee58a4
6 changed files with 28 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
gpu/gpu.mk
View file

@ -1,3 +1,4 @@
BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gpu/sepolicy BOARD_VENDOR_SEPOLICY_DIRS += device/google/gs-common/gpu/sepolicy
PRODUCT_PACKAGES += gpu_probe PRODUCT_PACKAGES += gpu_probe
PRODUCT_PACKAGES += android.hardware.neuralnetworks-shim-service-armnn

1
gpu/sepolicy/file_contexts
View file

@ -1,2 +1,3 @@
/vendor/bin/gpu_probe u:object_r:gpu_probe_exec:s0 /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

17
gpu/sepolicy/hal_neuralnetworks_armnn.te Normal file
View file

@ -0,0 +1,17 @@
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)

2
gpu/sepolicy/priv_app.te Normal file
View file

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

4
gpu/sepolicy/service.te Normal file
View file

@ -0,0 +1,4 @@
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;

3
gpu/sepolicy/service_contexts Normal file
View file

@ -0,0 +1,3 @@
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