Merge "Update to latest catapult (c69b7871)"
am: cd2d4f530a
Change-Id: If7ca251619faa34d8bd907f924cc5935e7f61012
diff --git a/catapult/common/OWNERS b/catapult/common/OWNERS
new file mode 100644
index 0000000..6720479
--- /dev/null
+++ b/catapult/common/OWNERS
@@ -0,0 +1,5 @@
+dtu@chromium.org
+eakuefner@chromium.org
+fmeawad@chromium.org
+simonhatch@chromium.org
+sullivan@chromium.org
diff --git a/catapult/common/battor/OWNERS b/catapult/common/battor/OWNERS
new file mode 100644
index 0000000..7638118
--- /dev/null
+++ b/catapult/common/battor/OWNERS
@@ -0,0 +1,2 @@
+charliea@chromium.org
+rnephew@chromium.org
diff --git a/catapult/common/eslint/OWNERS b/catapult/common/eslint/OWNERS
new file mode 100644
index 0000000..137ed40
--- /dev/null
+++ b/catapult/common/eslint/OWNERS
@@ -0,0 +1,2 @@
+charliea@chromium.org
+eakuefner@chromium.org
\ No newline at end of file
diff --git a/catapult/dependency_manager/OWNERS b/catapult/dependency_manager/OWNERS
new file mode 100644
index 0000000..ca5ce3b
--- /dev/null
+++ b/catapult/dependency_manager/OWNERS
@@ -0,0 +1 @@
+aiolos@chromium.org
diff --git a/catapult/dependency_manager/dependency_manager/OWNERS b/catapult/dependency_manager/dependency_manager/OWNERS
new file mode 100644
index 0000000..ca5ce3b
--- /dev/null
+++ b/catapult/dependency_manager/dependency_manager/OWNERS
@@ -0,0 +1 @@
+aiolos@chromium.org
diff --git a/catapult/devil/OWNERS b/catapult/devil/OWNERS
new file mode 100644
index 0000000..fd584fc
--- /dev/null
+++ b/catapult/devil/OWNERS
@@ -0,0 +1,4 @@
+jbudorick@chromium.org
+mikecase@chromium.org
+perezju@chromium.org
+rnephew@chromium.org
diff --git a/catapult/devil/devil/OWNERS b/catapult/devil/devil/OWNERS
new file mode 100644
index 0000000..fd584fc
--- /dev/null
+++ b/catapult/devil/devil/OWNERS
@@ -0,0 +1,4 @@
+jbudorick@chromium.org
+mikecase@chromium.org
+perezju@chromium.org
+rnephew@chromium.org
diff --git a/catapult/systrace/bin/OWNERS b/catapult/systrace/bin/OWNERS
new file mode 100644
index 0000000..374072a
--- /dev/null
+++ b/catapult/systrace/bin/OWNERS
@@ -0,0 +1,6 @@
+per-file adb_profile_chrome=file://systrace/profile_chrome/OWNERS
+per-file adb_profile_chrome_startup=file://systrace/profile_chrome/OWNERS
+
+per-file systrace=file://systrace/systrace/OWNERS
+
+ccraik@google.com
diff --git a/catapult/systrace/profile_chrome/OWNERS b/catapult/systrace/profile_chrome/OWNERS
new file mode 100644
index 0000000..51a6670
--- /dev/null
+++ b/catapult/systrace/profile_chrome/OWNERS
@@ -0,0 +1,2 @@
+skyostil@chromium.org
+zhenw@chromium.org
diff --git a/catapult/systrace/systrace/OWNERS b/catapult/systrace/systrace/OWNERS
new file mode 100644
index 0000000..a007f0a
--- /dev/null
+++ b/catapult/systrace/systrace/OWNERS
@@ -0,0 +1 @@
+ccraik@google.com
diff --git a/update.py b/update.py
index c18f8c0..9e53f9e 100755
--- a/update.py
+++ b/update.py
@@ -3,8 +3,7 @@
import codecs, httplib, json, optparse, os, urllib, shutil, subprocess, sys
upstream_git = 'https://github.com/catapult-project/catapult.git'
-PACKAGE_DIRS = ['common', 'dependency_manager', 'devil', 'systrace', 'telemetry']
-IGNORE_PATTERNS = ['OWNERS'] # doesn't make sense to sync owners files
+PACKAGE_DIRS = ['common', 'dependency_manager', 'devil', 'systrace']
script_dir = os.path.dirname(os.path.abspath(sys.argv[0]))
catapult_src_dir = os.path.join(script_dir, 'catapult-upstream')
@@ -61,5 +60,4 @@
shutil.rmtree(catapult_dst_dir)
for d in PACKAGE_DIRS:
shutil.copytree(os.path.join(catapult_src_dir, d),
- os.path.join(catapult_dst_dir, d),
- ignore=shutil.ignore_patterns(*IGNORE_PATTERNS))
+ os.path.join(catapult_dst_dir, d))
