From 3725e9c63814e9cf00b7f08d68f5c7d311da3124 Mon Sep 17 00:00:00 2001 From: Neil Fuller Date: Thu, 14 Oct 2021 12:55:21 +0100 Subject: [PATCH] Attempt 2 for adding OWNERS for SNTP code Commit e5ad1297165888eb5eef24c1985e64b18b8fb88b combined with pending reviews demonstrated the OWNERS syntax has quirks and it is not working as intended. Documentation used: https://android-review.googlesource.com/plugins/code-owners/Documentation/backend-find-owners.html#syntax The syntax guide recommends that patterns like sub-dir/* aren't used as they can cause problems when renaming directories; better to have OWNERS in the sub-dir. The pattern sntp/* didn't appear to be working (perhaps because of spaces). Test: None Bug: 199481251 Change-Id: I193744eaaad529b9680d3ccf905b86d68f62f7ff --- core/java/android/net/OWNERS | 4 ++-- core/java/android/net/sntp/OWNERS | 1 + core/tests/coretests/src/android/net/OWNERS | 2 ++ core/tests/coretests/src/android/net/sntp/OWNERS | 1 + 4 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 core/java/android/net/sntp/OWNERS create mode 100644 core/tests/coretests/src/android/net/sntp/OWNERS diff --git a/core/java/android/net/OWNERS b/core/java/android/net/OWNERS index 24a06dfc8b978..f55bcd31feb7b 100644 --- a/core/java/android/net/OWNERS +++ b/core/java/android/net/OWNERS @@ -2,5 +2,5 @@ set noparent include platform/frameworks/base:/services/core/java/com/android/server/net/OWNERS -per-file SSL*, Uri*, Url* = prb@google.com, dauletz@google.com, narayan@google.com, ngeoffray@google.com -per-file SntpClient*, sntp/* = file:/services/core/java/com/android/server/timedetector/OWNERS +per-file SSL*,Uri*,Url* = prb@google.com,oth@google.com,narayan@google.com,ngeoffray@google.com +per-file SntpClient* = file:/services/core/java/com/android/server/timedetector/OWNERS diff --git a/core/java/android/net/sntp/OWNERS b/core/java/android/net/sntp/OWNERS new file mode 100644 index 0000000000000..9a3e264a067f0 --- /dev/null +++ b/core/java/android/net/sntp/OWNERS @@ -0,0 +1 @@ +include /services/core/java/com/android/server/timedetector/OWNERS diff --git a/core/tests/coretests/src/android/net/OWNERS b/core/tests/coretests/src/android/net/OWNERS index aa87958f1d538..4e5136f93b94e 100644 --- a/core/tests/coretests/src/android/net/OWNERS +++ b/core/tests/coretests/src/android/net/OWNERS @@ -1 +1,3 @@ include /services/core/java/com/android/server/net/OWNERS + +per-file SntpClient* = file:/services/core/java/com/android/server/timedetector/OWNERS diff --git a/core/tests/coretests/src/android/net/sntp/OWNERS b/core/tests/coretests/src/android/net/sntp/OWNERS new file mode 100644 index 0000000000000..232c2ebe75e0e --- /dev/null +++ b/core/tests/coretests/src/android/net/sntp/OWNERS @@ -0,0 +1 @@ +include /core/java/android/net/sntp/OWNERS