Merge "reorganize trusty_metricsd settings" into sc-dev
diff --git a/trusty_metricsd/file_contexts b/trusty_metricsd/file_contexts
new file mode 100644
index 0000000..bedf743
--- /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 d04d3ab..71864a0 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