Merge "Coalesce OWNERS and add component"

2026-02-01 22:04:26 +00:00 · 2022-10-19 05:25:08 +00:00
parent 2a5c5fc11e 02abced109
commit e1185fa1fd
13 changed files with 25 additions and 41 deletions
--- a/keymaster/3.0/default/OWNERS
+++ b/keymaster/3.0/default/OWNERS
@@ -1,2 +0,0 @@
-jdanis@google.com
-swillden@google.com
--- a/keymaster/3.0/vts/OWNERS
+++ b/keymaster/3.0/vts/OWNERS
@@ -1,5 +0,0 @@
-drysdale@google.com
-jdanis@google.com
-swillden@google.com
-yim@google.com
-yuexima@google.com
--- a/keymaster/3.0/vts/functional/OWNERS
+++ b/keymaster/3.0/vts/functional/OWNERS
@@ -1,2 +0,0 @@
-# Bug component: 189335
-swillden@google.com
--- a/keymaster/4.0/default/OWNERS
+++ b/keymaster/4.0/default/OWNERS
@@ -1,2 +0,0 @@
-jdanis@google.com
-swillden@google.com
--- a/keymaster/4.0/support/OWNERS
+++ b/keymaster/4.0/support/OWNERS
@@ -1,3 +0,0 @@
-jdanis@google.com
-swillden@google.com
-jbires@google.com
--- a/keymaster/4.0/vts/OWNERS
+++ b/keymaster/4.0/vts/OWNERS
@@ -1,6 +0,0 @@
-drysdale@google.com
-jbires@google.com
-jdanis@google.com
-swillden@google.com
-yim@google.com
-yuexima@google.com
--- a/keymaster/4.0/vts/functional/OWNERS
+++ b/keymaster/4.0/vts/functional/OWNERS
@@ -1,2 +0,0 @@
-# Bug component: 189335
-swillden@google.com
--- a/keymaster/4.1/default/OWNERS
+++ b/keymaster/4.1/default/OWNERS
@@ -1,4 +0,0 @@
-jbires@google.com
-jdanis@google.com
-swillden@google.com
-zeuthen@google.com
--- a/keymaster/4.1/support/OWNERS
+++ b/keymaster/4.1/support/OWNERS
@@ -1,4 +0,0 @@
-jbires@google.com
-jdanis@google.com
-swillden@google.com
-zeuthen@google.com
--- a/keymaster/4.1/vts/OWNERS
+++ b/keymaster/4.1/vts/OWNERS
@@ -1,5 +0,0 @@
-drysdale@google.com
-jbires@google.com
-jdanis@google.com
-swillden@google.com
-zeuthen@google.com
--- a/keymaster/4.1/vts/functional/OWNERS
+++ b/keymaster/4.1/vts/functional/OWNERS
@@ -1,2 +0,0 @@
-# Bug component: 189335
-swillden@google.com
--- a/keymaster/OWNERS
+++ b/keymaster/OWNERS
@@ -0,0 +1,14 @@
+# Bug component: 1084733
+
+# Please assign all bugs related to /hardware/interfaces/keymaster to the team alias:
+#
+#    android-hardware-security@google.com
+#
+# This will get them auto-assigned to the on-call triage engineer, ensuring quickest response.
+
+drysdale@google.com
+eranm@google.com
+hasinitg@google.com
+jbires@google.com
+swillden@google.com
+zeuthen@google.com
--- a/security/OWNERS
+++ b/security/OWNERS
@@ -1,7 +1,14 @@
-# Please assign all bugs related to /hardware/interfaces/security to the team alias,
-# android-hardware-security@google.com.  This will get them auto-assigned to the on-call triage
-# engineer, ensuring quickest response.
+# Bug component: 1084733
+
+# Please assign all bugs related to /hardware/interfaces/security/ to the team alias:
+#
+#    android-hardware-security@google.com
+#
+# This will get them auto-assigned to the on-call triage engineer, ensuring quickest response.
+
 drysdale@google.com
+eranm@google.com
+hasinitg@google.com
 jbires@google.com
-seleneh@google.com
 swillden@google.com
+zeuthen@google.com