From 02f93b60969b0c3622e54b2aade0565cd9fe98a9 Mon Sep 17 00:00:00 2001
From: Adam Shih <adamshih@google.com>
Date: Tue, 8 Jun 2021 11:10:45 +0800
Subject: [PATCH] modulize hal_neuralnetwork_armnn

Bug: 189895314
Bug: 171160755
Bug: 171670122
Bug: 180858476
Test: make sure all affected devices' armnn module has the right label
Change-Id: I6ca736f156497738167ba5eea5606a0e654611b9
---
 neuralnetworks/file_contexts                  |  1 +
 .../hal_neuralnetworks_armnn.te               |  0
 tracking_denials/hal_neuralnetworks_armnn.te  | 30 -------------------
 whitechapel/vendor/google/file_contexts       |  1 -
 4 files changed, 1 insertion(+), 31 deletions(-)
 create mode 100644 neuralnetworks/file_contexts
 rename {whitechapel/vendor/google => neuralnetworks}/hal_neuralnetworks_armnn.te (100%)

diff --git a/neuralnetworks/file_contexts b/neuralnetworks/file_contexts
new file mode 100644
index 00000000..fc151ab9
--- /dev/null
+++ b/neuralnetworks/file_contexts
@@ -0,0 +1 @@
+/vendor/bin/hw/android\.hardware\.neuralnetworks@1\.3-service-armnn   u:object_r:hal_neuralnetworks_armnn_exec:s0
diff --git a/whitechapel/vendor/google/hal_neuralnetworks_armnn.te b/neuralnetworks/hal_neuralnetworks_armnn.te
similarity index 100%
rename from whitechapel/vendor/google/hal_neuralnetworks_armnn.te
rename to neuralnetworks/hal_neuralnetworks_armnn.te
diff --git a/tracking_denials/hal_neuralnetworks_armnn.te b/tracking_denials/hal_neuralnetworks_armnn.te
index 9ebda637..04941460 100644
--- a/tracking_denials/hal_neuralnetworks_armnn.te
+++ b/tracking_denials/hal_neuralnetworks_armnn.te
@@ -1,33 +1,3 @@
-# b/171160755
-dontaudit hal_neuralnetworks_armnn traced:unix_stream_socket connectto ;
-dontaudit hal_neuralnetworks_armnn hal_neuralnetworks_hwservice:hwservice_manager add ;
-dontaudit hal_neuralnetworks_armnn hal_neuralnetworks_hwservice:hwservice_manager find ;
-dontaudit hal_neuralnetworks_armnn hwservicemanager:binder transfer ;
-dontaudit hal_neuralnetworks_armnn hwservicemanager:binder call ;
-dontaudit hal_neuralnetworks_armnn hwservicemanager_prop:file map ;
-dontaudit hal_neuralnetworks_armnn hwservicemanager_prop:file getattr ;
-dontaudit hal_neuralnetworks_armnn hwservicemanager_prop:file open ;
-dontaudit hal_neuralnetworks_armnn hwservicemanager_prop:file read ;
-dontaudit hal_neuralnetworks_armnn gpu_device:chr_file {read write} ;
-dontaudit hal_neuralnetworks_armnn gpu_device:chr_file open ;
-dontaudit hal_neuralnetworks_armnn gpu_device:chr_file getattr ;
-dontaudit hal_neuralnetworks_armnn gpu_device:chr_file ioctl ;
-dontaudit hal_neuralnetworks_armnn gpu_device:chr_file map ;
-dontaudit hal_neuralnetworks_armnn gpu_device:chr_file {read write} ;
-dontaudit hal_neuralnetworks_armnn traced_producer_socket:sock_file write ;
-dontaudit hal_neuralnetworks_armnn hidl_base_hwservice:hwservice_manager add ;
-# b/171670122
-dontaudit hal_neuralnetworks_armnn debugfs_tracing:file { read };
-dontaudit hal_neuralnetworks_armnn debugfs_tracing:file { open };
 # b/180550063
 dontaudit hal_neuralnetworks_armnn system_data_file:dir { search };
 dontaudit hal_neuralnetworks_armnn system_data_file:dir { search };
-# b/180858476
-dontaudit hal_neuralnetworks_armnn default_prop:file { read };
-dontaudit hal_neuralnetworks_armnn default_prop:file { read };
-dontaudit hal_neuralnetworks_armnn default_prop:file { open };
-dontaudit hal_neuralnetworks_armnn default_prop:file { getattr };
-dontaudit hal_neuralnetworks_armnn default_prop:file { map };
-dontaudit hal_neuralnetworks_armnn default_prop:file { open };
-dontaudit hal_neuralnetworks_armnn default_prop:file { getattr };
-dontaudit hal_neuralnetworks_armnn default_prop:file { map };
diff --git a/whitechapel/vendor/google/file_contexts b/whitechapel/vendor/google/file_contexts
index 81ceb723..45d9d762 100644
--- a/whitechapel/vendor/google/file_contexts
+++ b/whitechapel/vendor/google/file_contexts
@@ -345,7 +345,6 @@
 /vendor/bin/aocd   u:object_r:aocd_exec:s0
 
 # NeuralNetworks file contexts
-/vendor/bin/hw/android\.hardware\.neuralnetworks@1\.3-service-armnn   u:object_r:hal_neuralnetworks_armnn_exec:s0
 /vendor/bin/hw/android\.hardware\.neuralnetworks@service-darwinn-aidl u:object_r:hal_neuralnetworks_darwinn_exec:s0
 
 # GRIL