From 8947d2dfebea6f3fe2be1ac87492e67ee72b5915 Mon Sep 17 00:00:00 2001 From: Adam Shih Date: Wed, 9 Jun 2021 13:59:09 +0800 Subject: [PATCH] reorganize trusty_metricsd settings Bug: 190331503 Test: build ROM and see the file and sepolicy settings are still there Change-Id: Ib157f64428166232c3bbbd176d3c1fbed4ac31d6 --- trusty_metricsd/file_contexts | 1 + .../vendor/google => trusty_metricsd}/trusty_metricsd.te | 0 whitechapel/vendor/google/file_contexts | 1 - 3 files changed, 1 insertion(+), 1 deletion(-) create mode 100644 trusty_metricsd/file_contexts rename {whitechapel/vendor/google => trusty_metricsd}/trusty_metricsd.te (100%) diff --git a/trusty_metricsd/file_contexts b/trusty_metricsd/file_contexts new file mode 100644 index 00000000..bedf7437 --- /dev/null +++ b/trusty_metricsd/file_contexts @@ -0,0 +1 @@ +/vendor/bin/trusty_metricsd u:object_r:trusty_metricsd_exec:s0 diff --git a/whitechapel/vendor/google/trusty_metricsd.te b/trusty_metricsd/trusty_metricsd.te similarity index 100% rename from whitechapel/vendor/google/trusty_metricsd.te rename to trusty_metricsd/trusty_metricsd.te diff --git a/whitechapel/vendor/google/file_contexts b/whitechapel/vendor/google/file_contexts index d04d3abe..71864a0d 100644 --- a/whitechapel/vendor/google/file_contexts +++ b/whitechapel/vendor/google/file_contexts @@ -328,7 +328,6 @@ /vendor/bin/securedpud.slider u:object_r:securedpud_slider_exec:s0 /vendor/bin/storageproxyd u:object_r:tee_exec:s0 /vendor/bin/trusty_apploader u:object_r:trusty_apploader_exec:s0 -/vendor/bin/trusty_metricsd u:object_r:trusty_metricsd_exec:s0 /vendor/bin/hw/android\.hardware\.gatekeeper@1\.0-service\.trusty u:object_r:hal_gatekeeper_default_exec:s0 /vendor/bin/hw/android\.hardware\.keymaster@4\.0-service\.trusty u:object_r:hal_keymaster_default_exec:s0 /vendor/bin/hw/android\.hardware\.security\.keymint-service\.trusty u:object_r:hal_keymint_default_exec:s0