summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTreehugger Robot <treehugger-gerrit@google.com>2020-12-14 21:34:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-12-14 21:34:49 +0000
commit550156c20284347cd318626fda171cab27d14bc8 (patch)
tree3122fe01165cc1254ff15231001ea048c9f8b8ad
parent1ef41dd092e2693608a5056e078582cfa60f0043 (diff)
parent578171d320303d0b5592bd4b07c35297106e44bb (diff)
Merge "Add resources owners to core/jni and split-select" am: 2991744d47 am: 578171d320
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1527770 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I4c7c306f78522c509709fc532727dbe7e670f365
-rw-r--r--core/jni/OWNERS8
-rw-r--r--tools/split-select/OWNERS1
2 files changed, 8 insertions, 1 deletions
diff --git a/core/jni/OWNERS b/core/jni/OWNERS
index 804829801b29..54b0340f5ef7 100644
--- a/core/jni/OWNERS
+++ b/core/jni/OWNERS
@@ -20,11 +20,17 @@ per-file android_view_PointerIcon.* = file:/services/core/java/com/android/serve
per-file android_graphics_BLASTBufferQueue.cpp = file:/services/core/java/com/android/server/wm/OWNERS
per-file android_view_Surface* = file:/services/core/java/com/android/server/wm/OWNERS
+# Resources
+per-file android_content_res_* = file:/core/java/android/content/res/OWNERS
+per-file android_util_AssetManager* = file:/core/java/android/content/res/OWNERS
+per-file android_util_StringBlock* = file:/core/java/android/content/res/OWNERS
+per-file android_util_XmlBlock* = file:/core/java/android/content/res/OWNERS
+per-file com_android_internal_content_om_OverlayConfig* = file:/core/java/android/content/res/OWNERS
+
per-file *Zygote* = file:/ZYGOTE_OWNERS
per-file Android.bp = file:platform/build/soong:/OWNERS
per-file android_animation_* = file:/core/java/android/animation/OWNERS
per-file android_app_admin_* = file:/core/java/android/app/admin/OWNERS
-per-file android_content_res_* = file:/core/java/android/content/res/OWNERS
per-file android_graphics_* = file:/graphics/java/android/graphics/OWNERS
per-file android_hardware_Usb* = file:/services/usb/OWNERS
per-file android_hardware_display_* = file:/core/java/android/hardware/display/OWNERS
diff --git a/tools/split-select/OWNERS b/tools/split-select/OWNERS
new file mode 100644
index 000000000000..6c50ede5bb8c
--- /dev/null
+++ b/tools/split-select/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/content/res/OWNERS \ No newline at end of file