Clean up Android layout owners files

Bug: 1018108
Change-Id: If1d40b5545819b01dd95eac7f6bf3edd98726f17
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1881550
Commit-Queue: Jochen Eisinger <jochen@chromium.org>
Reviewed-by: Ted Choc <tedchoc@chromium.org>
Cr-Commit-Position: refs/heads/master@{#710023}

build/OWNERS.setnoparent

@@ -29,3 +29,8 @@ file://third_party/blink/API_OWNERS
 
 # Extension API related files.
 file://extensions/common/api/API_OWNERS
+
+# This restriction is in place to avoid accidential addition to our top level
+# layout files, such as add duplicated assets, or introducing new colors when
+# we don't want them.
+file://ui/android/java/res/LAYOUT_OWNERS

build/android/gyp/prepare_resources.py

@@ -19,7 +19,7 @@ from util import manifest_utils
 from util import resource_utils
 
 _AAPT_IGNORE_PATTERN = ':'.join([
-    'OWNERS',  # Allow OWNERS files within res/
+    '*OWNERS',  # Allow OWNERS files within res/
     '*.py',  # PRESUBMIT.py sometimes exist.
     '*.pyc',
     '*~',  # Some editors create these as temp files.

chrome/android/java/res/OWNERS

@@ -3,9 +3,7 @@
 # we don't want them.
 set noparent
 
-file://ui/android/java/res/OWNERS
-
-bsazonov@chromium.org
+file://ui/android/java/res/LAYOUT_OWNERS
 
 # New Tab Page changes only:
 mvanouwerkerk@chromium.org

chrome/android/java/res_chromium/OWNERS

@@ -3,6 +3,6 @@
 # we don't want them.
 set noparent
 
-file://chrome/android/java/res/OWNERS
+file://ui/android/java/res/LAYOUT_OWNERS
 # COMPONENT: UI>Browser>Mobile
 # OS: Android

chrome/android/java/res_night/OWNERS

@@ -3,7 +3,7 @@
 # we don't want them.
 set noparent
 
-file://ui/android/java/res/OWNERS
+file://ui/android/java/res/LAYOUT_OWNERS
 
 # COMPONENT: UI>Browser>Mobile
 # OS: Android

content/public/android/java/res/OWNERS

@@ -3,7 +3,7 @@
 # we don't want them.
 set noparent
 
-file://ui/android/java/res/OWNERS
+file://ui/android/java/res/LAYOUT_OWNERS
 
 # COMPONENT: Content>Core
 # OS: Android

ui/android/java/res/LAYOUT_OWNERS

+bsazonov@chromium.org
+dtrainor@chromium.org
+mdjones@chromium.org
+tedchoc@chromium.org
+twellington@chromium.org
+yusufo@chromium.org

ui/android/java/res/OWNERS

@@ -2,12 +2,7 @@
 # layout files, such as add duplicated assets, or introducing new colors when
 # we don't want them.
 set noparent
-
-dtrainor@chromium.org
-mdjones@chromium.org
-tedchoc@chromium.org
-twellington@chromium.org
-yusufo@chromium.org
+file://ui/android/java/res/LAYOUT_OWNERS
 
 # COMPONENT: UI>Browser>Mobile
 # OS: Android

ui/android/java/res_night/OWNERS

@@ -3,7 +3,7 @@
 # we don't want them.
 set noparent
 
-file://ui/android/java/res/OWNERS
+file://ui/android/java/res/LAYOUT_OWNERS
 
 # COMPONENT: UI>Browser>Mobile
 # OS: Android