summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Felipe Leme <felipeal@google.com> 2018-11-21 14:37:39 -0800
committer android-build-merger <android-build-merger@google.com> 2018-11-21 14:37:39 -0800
commit80ae48bff3797b8b397ca06a91f527b4b1279477 (patch)
tree6e2c4fd427691ad7f453b0e121f94076321119f6
parent66ba8e8dbc45a80e8f42f6e3b507fad9e2c8c773 (diff)
parent2ffd64805ccc598b33fcf41745cc6715cd7d87be (diff)
Merge "Added OWNERS to Shell and hook to make sure it's developed on AOSP." am: 4384c5c241
am: 2ffd64805c Change-Id: Ida97bc760fb5d26ace3ac1092f05b3b8fa7ede7f
-rw-r--r--PREUPLOAD.cfg2
-rw-r--r--packages/Shell/OWNERS8
2 files changed, 7 insertions, 3 deletions
diff --git a/PREUPLOAD.cfg b/PREUPLOAD.cfg
index 07b0ae10fd55..01df817ead56 100644
--- a/PREUPLOAD.cfg
+++ b/PREUPLOAD.cfg
@@ -16,3 +16,5 @@ strings_lint_hook = ${REPO_ROOT}/frameworks/base/tools/stringslint/stringslint_s
hidden_api_txt_hook = ${REPO_ROOT}/frameworks/base/tools/hiddenapi/checksorted_sha.sh ${PREUPLOAD_COMMIT} ${REPO_ROOT}
owners_hook = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} "OWNERS$"
+
+shell_hook = ${REPO_ROOT}/frameworks/base/tools/aosp/aosp_sha.sh ${PREUPLOAD_COMMIT} "^packages/Shell/"
diff --git a/packages/Shell/OWNERS b/packages/Shell/OWNERS
index 75c0391e6840..6ba1fcb058b1 100644
--- a/packages/Shell/OWNERS
+++ b/packages/Shell/OWNERS
@@ -1,10 +1,12 @@
+set noparent
+
+jsharkey@android.com
+felipeal@google.com
+nandana@google.com
svetoslavganov@google.com
hackbod@google.com
yamasani@google.com
moltmann@google.com
toddke@google.com
-jsharkey@google.com
cbrubaker@google.com
omakoto@google.com
-nandana@google.com
-felipeal@google.com