From 02abced10971fc791625168215b55615770a50fd Mon Sep 17 00:00:00 2001 From: David Drysdale Date: Thu, 13 Oct 2022 09:21:31 +0100 Subject: [PATCH] Coalesce OWNERS and add component Test: TreeHugger Bug: 237676243 Change-Id: I04f79cfcf3a4a4dd132e17e93b53c2807818d60d --- keymaster/3.0/default/OWNERS | 2 -- keymaster/3.0/vts/OWNERS | 5 ----- keymaster/3.0/vts/functional/OWNERS | 2 -- keymaster/4.0/default/OWNERS | 2 -- keymaster/4.0/support/OWNERS | 3 --- keymaster/4.0/vts/OWNERS | 6 ------ keymaster/4.0/vts/functional/OWNERS | 2 -- keymaster/4.1/default/OWNERS | 4 ---- keymaster/4.1/support/OWNERS | 4 ---- keymaster/4.1/vts/OWNERS | 5 ----- keymaster/4.1/vts/functional/OWNERS | 2 -- keymaster/OWNERS | 14 ++++++++++++++ security/OWNERS | 15 +++++++++++---- 13 files changed, 25 insertions(+), 41 deletions(-) delete mode 100644 keymaster/3.0/default/OWNERS delete mode 100644 keymaster/3.0/vts/OWNERS delete mode 100644 keymaster/3.0/vts/functional/OWNERS delete mode 100644 keymaster/4.0/default/OWNERS delete mode 100644 keymaster/4.0/support/OWNERS delete mode 100644 keymaster/4.0/vts/OWNERS delete mode 100644 keymaster/4.0/vts/functional/OWNERS delete mode 100644 keymaster/4.1/default/OWNERS delete mode 100644 keymaster/4.1/support/OWNERS delete mode 100644 keymaster/4.1/vts/OWNERS delete mode 100644 keymaster/4.1/vts/functional/OWNERS create mode 100644 keymaster/OWNERS diff --git a/keymaster/3.0/default/OWNERS b/keymaster/3.0/default/OWNERS deleted file mode 100644 index 335660da3b..0000000000 --- a/keymaster/3.0/default/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -jdanis@google.com -swillden@google.com diff --git a/keymaster/3.0/vts/OWNERS b/keymaster/3.0/vts/OWNERS deleted file mode 100644 index 846bb84499..0000000000 --- a/keymaster/3.0/vts/OWNERS +++ /dev/null @@ -1,5 +0,0 @@ -drysdale@google.com -jdanis@google.com -swillden@google.com -yim@google.com -yuexima@google.com diff --git a/keymaster/3.0/vts/functional/OWNERS b/keymaster/3.0/vts/functional/OWNERS deleted file mode 100644 index 2ef90869c6..0000000000 --- a/keymaster/3.0/vts/functional/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# Bug component: 189335 -swillden@google.com diff --git a/keymaster/4.0/default/OWNERS b/keymaster/4.0/default/OWNERS deleted file mode 100644 index 335660da3b..0000000000 --- a/keymaster/4.0/default/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -jdanis@google.com -swillden@google.com diff --git a/keymaster/4.0/support/OWNERS b/keymaster/4.0/support/OWNERS deleted file mode 100644 index a9efe66419..0000000000 --- a/keymaster/4.0/support/OWNERS +++ /dev/null @@ -1,3 +0,0 @@ -jdanis@google.com -swillden@google.com -jbires@google.com diff --git a/keymaster/4.0/vts/OWNERS b/keymaster/4.0/vts/OWNERS deleted file mode 100644 index 0d6fa6c45a..0000000000 --- a/keymaster/4.0/vts/OWNERS +++ /dev/null @@ -1,6 +0,0 @@ -drysdale@google.com -jbires@google.com -jdanis@google.com -swillden@google.com -yim@google.com -yuexima@google.com diff --git a/keymaster/4.0/vts/functional/OWNERS b/keymaster/4.0/vts/functional/OWNERS deleted file mode 100644 index 2ef90869c6..0000000000 --- a/keymaster/4.0/vts/functional/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# Bug component: 189335 -swillden@google.com diff --git a/keymaster/4.1/default/OWNERS b/keymaster/4.1/default/OWNERS deleted file mode 100644 index 2b2ad2a08e..0000000000 --- a/keymaster/4.1/default/OWNERS +++ /dev/null @@ -1,4 +0,0 @@ -jbires@google.com -jdanis@google.com -swillden@google.com -zeuthen@google.com \ No newline at end of file diff --git a/keymaster/4.1/support/OWNERS b/keymaster/4.1/support/OWNERS deleted file mode 100644 index 2b2ad2a08e..0000000000 --- a/keymaster/4.1/support/OWNERS +++ /dev/null @@ -1,4 +0,0 @@ -jbires@google.com -jdanis@google.com -swillden@google.com -zeuthen@google.com \ No newline at end of file diff --git a/keymaster/4.1/vts/OWNERS b/keymaster/4.1/vts/OWNERS deleted file mode 100644 index 24ed04253d..0000000000 --- a/keymaster/4.1/vts/OWNERS +++ /dev/null @@ -1,5 +0,0 @@ -drysdale@google.com -jbires@google.com -jdanis@google.com -swillden@google.com -zeuthen@google.com \ No newline at end of file diff --git a/keymaster/4.1/vts/functional/OWNERS b/keymaster/4.1/vts/functional/OWNERS deleted file mode 100644 index 2ef90869c6..0000000000 --- a/keymaster/4.1/vts/functional/OWNERS +++ /dev/null @@ -1,2 +0,0 @@ -# Bug component: 189335 -swillden@google.com diff --git a/keymaster/OWNERS b/keymaster/OWNERS new file mode 100644 index 0000000000..ac8bd83cb4 --- /dev/null +++ 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 diff --git a/security/OWNERS b/security/OWNERS index f061cd6f5c..fbaf85424e 100644 --- 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