summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeigo Nonaka <nona@google.com>2021-02-04 21:50:29 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2021-02-04 21:50:29 +0000
commit7fc019ca7b13a7125fdd356ecbfa923d355c0c15 (patch)
treec814047d6e16cac8c5b4faaeb33ffaf5517e4fb1
parent3a41f297f5af14026cdcf052a534987cdb9fc84a (diff)
parent1bba2cdafad2caa68cd591d50c53237cad9fe20e (diff)
Merge "Update OWNERS file for font files in FrameworksCoreTests" am: eff415e780 am: a4e2684bb5 am: 1bba2cdafa
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1548869 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I271582e3e246a35da9274d8ecee669fd307e76c9
-rw-r--r--apct-tests/perftests/core/OWNERS1
-rw-r--r--core/tests/coretests/assets/fonts/OWNERS1
-rw-r--r--core/tests/coretests/assets/fonts_for_family_selection/OWNERS1
-rw-r--r--core/tests/coretests/res/font/OWNERS1
-rw-r--r--native/android/OWNERS1
5 files changed, 5 insertions, 0 deletions
diff --git a/apct-tests/perftests/core/OWNERS b/apct-tests/perftests/core/OWNERS
new file mode 100644
index 000000000000..18486af9d12c
--- /dev/null
+++ b/apct-tests/perftests/core/OWNERS
@@ -0,0 +1 @@
+include /graphics/java/android/graphics/fonts/OWNERS
diff --git a/core/tests/coretests/assets/fonts/OWNERS b/core/tests/coretests/assets/fonts/OWNERS
new file mode 100644
index 000000000000..b0e0b9deaddb
--- /dev/null
+++ b/core/tests/coretests/assets/fonts/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/text/OWNERS
diff --git a/core/tests/coretests/assets/fonts_for_family_selection/OWNERS b/core/tests/coretests/assets/fonts_for_family_selection/OWNERS
new file mode 100644
index 000000000000..b0e0b9deaddb
--- /dev/null
+++ b/core/tests/coretests/assets/fonts_for_family_selection/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/text/OWNERS
diff --git a/core/tests/coretests/res/font/OWNERS b/core/tests/coretests/res/font/OWNERS
new file mode 100644
index 000000000000..b0e0b9deaddb
--- /dev/null
+++ b/core/tests/coretests/res/font/OWNERS
@@ -0,0 +1 @@
+include /core/java/android/text/OWNERS
diff --git a/native/android/OWNERS b/native/android/OWNERS
index ac5a89527ef0..d414ed4cd5e2 100644
--- a/native/android/OWNERS
+++ b/native/android/OWNERS
@@ -1,3 +1,4 @@
per-file libandroid_net.map.txt, net.c = set noparent
per-file libandroid_net.map.txt, net.c = codewiz@google.com, jchalard@google.com, junyulai@google.com
per-file libandroid_net.map.txt, net.c = lorenzo@google.com, reminv@google.com, satk@google.com
+per-file system_fonts.cpp = file:/graphics/java/android/graphics/fonts/OWNERS